Merge lp:~ken-vandine/chromium-browser/chromium-browser.quantal into lp:~chromium-team/chromium-browser/chromium-browser.quantal

[Ken VanDine]

Force building with gcc 4.6 to at least get a build into quantal and fix ftbfs (LP: #992212)

[lp:~ken-vandine/chromium-browser/chromium-browser.quantal]

737. By Ken VanDine on 2012-07-10

* New upstream release from the Stable Channel
* debian/control
  - Added build depends binutils-gold, libssl-dev and subversion
* -debian/patches/ubuntu_dont_overwrite_default_download_directory.patch
  - no longer needed
* debian/rules
  - force to build with gcc 4.6 to fix ftbfs (LP: #992212)
  - don't build with -Werror
* debian/control
  - add build depends for g++-4.6-multilib

738. By Ken VanDine on 2012-07-10

* debian/patches/grd_parse_fix.patch
  - Patched to fix broken XML until we can get a proper fix for
    chromium-translation-tools.

739. By Ken VanDine on 2012-07-10

Bumped standards version to 3.9.3

740. By Ken VanDine on 2012-07-10

merged

741. By Ken VanDine on 2012-07-11

* debian/rules
  - explicitly set arm_float_abi=hard for armhf builds and let the rest
    fallback to softfp
  - do not use third_party/gold as the linker.
  - enable compile-time dependency on gnome-keyring
* debian/patches/vpx.patch
  - patch from debian to fix FTBFS on armel
* debian/patches/arm.patch
  - patch from debian to fix FTBFS on armel

742. By Ken VanDine on 2012-07-11

Added build depends binutils-gold, libvpx-dev,libssl-dev and subversion

743. By Ken VanDine on 2012-07-12

don't build depend on binutils-gold for armel

744. By Ken VanDine on 2012-07-12

releasing version 20.0.1132.47~r144678-0ubuntu1

745. By Ken VanDine on 2012-07-12

* debian/control
  - Dropped build depends for libvpx-dev
* debian/apport:
 - Update apport hook for python3 (LP: #1013171)
    patch made with the help of Edward Donovan

746. By Ken VanDine on 2012-07-13

releasing version 20.0.1132.47~r144678-0ubuntu2

747. By Ken VanDine on 2012-08-06

releasing version 20.0.1132.47~r144678-0ubuntu3

=== modified file 'debian/apport/chromium-browser.py'
--- debian/apport/chromium-browser.py	2011-05-09 17:41:33 +0000
+++ debian/apport/chromium-browser.py	2012-08-06 17:52:22 +0000
@@ -11,6 +11,7 @@
 the full text of the license.
 '''
 
+from __future__ import print_function
 import os, sys, getopt, codecs
 import time
 from stat import *
@@ -57,7 +58,7 @@
     report['RelatedPackagesPolicy'] = ''
     for pkg in pkgs:
         script = subprocess.Popen(['apt-cache', 'policy', pkg], stdout=subprocess.PIPE)
-        report['RelatedPackagesPolicy'] += script.communicate()[0] + "\n"
+        report['RelatedPackagesPolicy'] += str(script.communicate()[0]) + "\n"
 
 def gconf_values(report, keys):
     report['gconf-keys'] = ''
@@ -67,7 +68,7 @@
         except OSError:
             report['gconf-keys'] = "gconftool-2 not found"
             return
-        out = script.communicate()[0]
+        out = str(script.communicate()[0])
         if out == "":
             out = "**unset**\n"
         report['gconf-keys'] += key + " = " + out
@@ -105,7 +106,7 @@
     # list entensions+versions
     report['ChromiumPrefs'] += "extensions/settings =\n"
     if 'settings' in entry['extensions']:
-        for ext in entry['extensions']['settings'].keys():
+        for ext in list(entry['extensions']['settings'].keys()):
             report['ChromiumPrefs'] += " - '" + ext + "'\n"
             if 'manifest' in entry['extensions']['settings'][ext]:
                 for k in [ 'name', 'description', 'version', 'update_url' ]:
@@ -243,17 +244,17 @@
 
     # Disk usage
     script = subprocess.Popen([ 'df', '-Th' ], stdout=subprocess.PIPE)
-    report['DiskUsage'] = script.communicate()[0] + "\n\nInodes:\n"
+    report['DiskUsage'] = str(script.communicate()[0]) + "\n\nInodes:\n"
     script = subprocess.Popen([ 'df', '-ih' ], stdout=subprocess.PIPE)
-    report['DiskUsage'] += script.communicate()[0]
+    report['DiskUsage'] += str(script.communicate()[0])
 
 ## DEBUGING ##
 if __name__ == '__main__':
     sys.stdout = codecs.getwriter('utf8')(sys.stdout)
     try:
         opts, args = getopt.getopt(sys.argv[1:], "-u:", [ 'user-dir=' ])
-    except getopt.GetoptError, err:
-        print str(err)
+    except getopt.GetoptError as err:
+        print(str(err))
         sys.exit(2)
 
     userdir = None
@@ -266,4 +267,4 @@
     report = {}
     add_info(report, userdir = userdir)
     for key in report:
-        print '[%s]\n%s\n' % (key, report[key])
+        print('[%s]\n%s\n' % (key, report[key]))

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-18 16:37:20 +0000
+++ debian/changelog	2012-08-06 17:52:22 +0000
@@ -1,3 +1,67 @@
+chromium-browser (20.0.1132.47~r144678-0ubuntu3) quantal; urgency=low
+
+  * debian/patches/1-infobars.patch
+    - moved infobars out of experimental, used for webapps
+  * debian/patches/2-get-domain-tld.patch
+    - Adds API for getting the base domain of a URI, used for webapps
+  * debian/patches/3-chrome-xid.patch
+    - Get xid, used for webapps
+  * debian/patches/chromeless-window-launch-option.patch
+    - Adds optional chromeless mode, used for webapps
+  * debian/patches/desktop-integration-settings.patch
+    - Adds settings for managing sites integrated with the desktop, used
+      for webapps
+
+ -- Ken VanDine <[e-mail]>  Mon, 06 Aug 2012 13:40:57 -0400
+
+chromium-browser (20.0.1132.47~r144678-0ubuntu2) quantal; urgency=low
+
+  * debian/control
+    - Dropped build depends for libvpx-dev
+  * -debian/patches/vpx.patch
+    - dropped, build with internal vpx
+
+  [ Matthieu Baerts ]
+  * debian/apport:
+   - Update apport hook for python3 (LP: #1013171)
+     patch made with the help of Edward Donovan
+
+ -- Ken VanDine <[e-mail]>  Thu, 12 Jul 2012 15:56:59 -0400
+
+chromium-browser (20.0.1132.47~r144678-0ubuntu1) quantal; urgency=low
+
+  * New upstream release from the Stable Channel
+  * debian/control
+    - Added build depends binutils-gold, libvpx-dev,libssl-dev and subversion
+    - Bumped standards version to 3.9.3
+    - don't build depend on binutils-gold for armel
+  * debian/rules
+    - explicitly set arm_float_abi=hard for armhf builds and let the rest
+      fallback to softfp
+    - do not use third_party/gold as the linker.
+    - enable compile-time dependency on gnome-keyring
+  * -debian/patches/ubuntu_dont_overwrite_default_download_directory.patch
+    - no longer needed
+  * debian/patches/grd_parse_fix.patch
+    - Patched to fix broken XML until we can get a proper fix for
+      chromium-translation-tools.
+  * debian/patches/vpx.patch
+    - patch from debian to fix FTBFS on armel
+  * debian/patches/arm.patch
+    - patch from debian to fix FTBFS on armel
+
+ -- Ken VanDine <[e-mail]>  Thu, 12 Jul 2012 14:02:44 -0400
+
+chromium-browser (18.0.1025.168~r134367-0ubuntu2) quantal; urgency=low
+
+  * debian/rules
+    - force to build with gcc 4.6 to fix ftbfs (LP: #992212)
+    - don't build with -Werror
+  * debian/control
+    - add build depends for g++-4.6-multilib
+
+ -- Ken VanDine <[e-mail]>  Fri, 06 Jul 2012 13:51:59 -0400
+
 chromium-browser (18.0.1025.168~r134367-0ubuntu1) quantal; urgency=low
   
   * debian/rules

=== modified file 'debian/control'
--- debian/control	2012-03-30 08:38:01 +0000
+++ debian/control	2012-08-06 17:52:22 +0000
@@ -13,6 +13,8 @@
 	patchutils (>= 0.2.25),
 	libc6-dev-i386 [amd64],
 	g++-multilib [amd64],
+	g++-4.6-multilib,
+	binutils-gold [!armel],
 	hardening-wrapper,
 	python,
 	bison,
@@ -48,8 +50,10 @@
 	libdbus-glib-1-dev,
 	libgnome-keyring-dev,
 	libudev-dev,
-	libgconf2-dev
-Standards-Version: 3.8.3
+	libgconf2-dev,
+	libssl-dev,
+	subversion
+Standards-Version: 3.9.3
 
 Package: chromium-browser
 Architecture: any

=== added file 'debian/patches/1-infobars.patch'
--- debian/patches/1-infobars.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/1-infobars.patch	2012-08-06 17:52:22 +0000
@@ -0,0 +1,193 @@
+Index: src/chrome/browser/infobars/infobar_extension_apitest.cc
+===================================================================
+--- src.orig/chrome/browser/infobars/infobar_extension_apitest.cc	2012-07-07 00:59:54.000000000 -0400
++++ src/chrome/browser/infobars/infobar_extension_apitest.cc	2012-07-16 15:33:42.371644366 -0400
+@@ -15,9 +15,5 @@
+ #endif
+ 
+ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Infobars) {
+-  // TODO(finnur): Remove once infobars are no longer experimental (bug 39511).
+-  CommandLine::ForCurrentProcess()->AppendSwitch(
+-      switches::kEnableExperimentalExtensionApis);
+-
+   ASSERT_TRUE(RunExtensionTest("infobars")) << message_;
+ }
+Index: src/chrome/browser/infobars/infobar_extension_api.h
+===================================================================
+--- src.orig/chrome/browser/infobars/infobar_extension_api.h	2012-07-07 00:59:54.000000000 -0400
++++ src/chrome/browser/infobars/infobar_extension_api.h	2012-07-16 15:33:42.371644366 -0400
+@@ -11,7 +11,7 @@
+ class ShowInfoBarFunction : public SyncExtensionFunction {
+   virtual ~ShowInfoBarFunction() {}
+   virtual bool RunImpl() OVERRIDE;
+-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.infobars.show")
++  DECLARE_EXTENSION_FUNCTION_NAME("infobars.show")
+ };
+ 
+ #endif  // CHROME_BROWSER_INFOBARS_INFOBAR_EXTENSION_API_H_
+Index: src/chrome/common/extensions_api_resources.grd
+===================================================================
+--- src.orig/chrome/common/extensions_api_resources.grd	2012-07-07 01:01:18.000000000 -0400
++++ src/chrome/common/extensions_api_resources.grd	2012-07-16 15:33:42.371644366 -0400
+@@ -28,7 +28,6 @@
+       <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS" file="extensions\api\experimental.downloads.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_FONTSSETTINGS" file="extensions\api\experimental.fontSettings.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_IDENTITY" file="extensions\api\experimental.identity.json" type="BINDATA" />
+-      <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS" file="extensions\api\experimental.infobars.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI" file="extensions\api\experimental.input.ui.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD" file="extensions\api\experimental.input.virtualKeyboard.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_KEYBINDING" file="extensions\api\experimental.keybinding.json" type="BINDATA" />
+@@ -45,6 +44,7 @@
+       <include name="IDR_EXTENSION_API_JSON_HISTORY" file="extensions\api\history.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_I18N" file="extensions\api\i18n.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_INPUT_IME" file="extensions\api\input.ime.json" type="BINDATA" />
++      <include name="IDR_EXTENSION_API_JSON_INFOBARS" file="extensions\api\infobars.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_IDLE" file="extensions\api\idle.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE" file="extensions\api\inputMethodPrivate.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_MANAGEDMODEPRIVATE" file="extensions\api\managedModePrivate.json" type="BINDATA" />
+Index: src/chrome/common/extensions/extension_permission_set.cc
+===================================================================
+--- src.orig/chrome/common/extensions/extension_permission_set.cc	2012-07-07 01:01:17.000000000 -0400
++++ src/chrome/common/extensions/extension_permission_set.cc	2012-07-16 15:33:42.371644366 -0400
+@@ -47,6 +47,7 @@
+   "devtools",
+   "extension",
+   "i18n",
++  "infobars",
+   "omnibox",
+   "pageAction",
+   "pageActions",
+Index: src/chrome/common/extensions/api/infobars.json
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/common/extensions/api/infobars.json	2012-07-16 15:38:08.703653129 -0400
+@@ -0,0 +1,51 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++[
++  {
++    "namespace": "infobars",
++    "dependencies": [ "windows" ],
++    "types": [],
++    "functions": [
++      {
++        "name": "show",
++        "type": "function",
++        "description": "Shows an infobar in the specified tab. The infobar will be closed automatically when the tab navigates. Use window.close() to close the infobar before then.",
++        "parameters": [
++          {
++            "name": "details",
++            "type": "object",
++            "properties": {
++              "tabId": {
++                "type": "integer",
++                "description": "The tab id for the tab to display the infobar in."
++              },
++              "path": {
++                "type": "string",
++                "description": "The html file that contains the infobar."
++              },
++              "height": {
++                "type": "integer",
++                "description": "The height (in pixels) of the infobar to show. If omitted, the default infobar height will be used.",
++                "optional": true,
++                "minimum": 0,
++                "maximum": 72
++              }
++            }
++          },
++          {
++            "type": "function",
++            "name": "callback",
++            "optional": true,
++            "parameters": [
++              {
++                "name": "window", "$ref": "Window", "description": "Contains details about the window in which the infobar was created."
++              }
++            ]
++          }
++        ]
++      }
++    ]
++  }
++]
+Index: src/chrome/common/extensions/api/extension_api.cc
+===================================================================
+--- src.orig/chrome/common/extensions/api/extension_api.cc	2012-07-07 01:01:17.000000000 -0400
++++ src/chrome/common/extensions/api/extension_api.cc	2012-07-16 15:33:42.375644366 -0400
+@@ -297,8 +297,6 @@
+       IDR_EXTENSION_API_JSON_EXPERIMENTAL_FONTSSETTINGS));
+   RegisterSchema("experimental.identity", ReadFromResource(
+       IDR_EXTENSION_API_JSON_EXPERIMENTAL_IDENTITY));
+-  RegisterSchema("experimental.infobars", ReadFromResource(
+-      IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS));
+   RegisterSchema("experimental.input.ui", ReadFromResource(
+       IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI));
+   RegisterSchema("experimental.input.virtualKeyboard", ReadFromResource(
+@@ -331,6 +329,8 @@
+       IDR_EXTENSION_API_JSON_I18N));
+   RegisterSchema("idle", ReadFromResource(
+       IDR_EXTENSION_API_JSON_IDLE));
++  RegisterSchema("infobars",ReadFromResource(
++      IDR_EXTENSION_API_JSON_INFOBARS));
+   RegisterSchema("experimental.input.ime", ReadFromResource(
+       IDR_EXTENSION_API_JSON_INPUT_IME));
+   RegisterSchema("inputMethodPrivate", ReadFromResource(
+Index: src/chrome/common/extensions/api/experimental.infobars.json
+===================================================================
+--- src.orig/chrome/common/extensions/api/experimental.infobars.json	2012-07-07 01:01:17.000000000 -0400
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,51 +0,0 @@
+-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style license that can be
+-// found in the LICENSE file.
+-
+-[
+-  {
+-    "namespace": "experimental.infobars",
+-    "dependencies": [ "windows" ],
+-    "types": [],
+-    "functions": [
+-      {
+-        "name": "show",
+-        "type": "function",
+-        "description": "Shows an infobar in the specified tab. The infobar will be closed automatically when the tab navigates. Use window.close() to close the infobar before then.",
+-        "parameters": [
+-          {
+-            "name": "details",
+-            "type": "object",
+-            "properties": {
+-              "tabId": {
+-                "type": "integer",
+-                "description": "The tab id for the tab to display the infobar in."
+-              },
+-              "path": {
+-                "type": "string",
+-                "description": "The html file that contains the infobar."
+-              },
+-              "height": {
+-                "type": "integer",
+-                "description": "The height (in pixels) of the infobar to show. If omitted, the default infobar height will be used.",
+-                "optional": true,
+-                "minimum": 0,
+-                "maximum": 72
+-              }
+-            }
+-          },
+-          {
+-            "type": "function",
+-            "name": "callback",
+-            "optional": true,
+-            "parameters": [
+-              {
+-                "name": "window", "$ref": "Window", "description": "Contains details about the window in which the infobar was created."
+-              }
+-            ]
+-          }
+-        ]
+-      }
+-    ]
+-  }
+-]

=== added file 'debian/patches/2-get-domain-tld.patch'
--- debian/patches/2-get-domain-tld.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/2-get-domain-tld.patch	2012-08-06 17:52:22 +0000
@@ -0,0 +1,255 @@
+Index: src/chrome/browser/extensions/api/tld/tld_api.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/browser/extensions/api/tld/tld_api.cc	2012-07-16 15:39:31.611655856 -0400
+@@ -0,0 +1,88 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "chrome/browser/extensions/api/tld/tld_api.h"
++
++#include "base/time.h"
++#include "base/values.h"
++#include "chrome/browser/extensions/extension_service.h"
++#include "chrome/common/extensions/extension.h"
++#include "chrome/common/extensions/extension_constants.h"
++#include "googleurl/src/gurl.h"
++#include "googleurl/src/url_parse.h"
++#include "googleurl/src/url_util.h"
++#include "net/base/registry_controlled_domain.h"
++
++namespace {
++const char kInvalidUriError[] = "Invalid or unsupported URI";
++
++bool IsValidUrl(const GURL& url) {
++  return url.is_valid() && url.IsStandard() &&
++     !url.SchemeIsFile() && !url.SchemeIsFileSystem();
++}
++}  // namespace
++
++bool TldGetBaseDomainFunction::RunImpl() {
++  EXTENSION_FUNCTION_VALIDATE(args_->GetSize() == 1);
++
++  std::string uri;
++  EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &uri));
++
++  // We might delegate all the url validity check to GetDomainAndRegistry
++  // but try to be more explicit about the errors in some cases.
++  const GURL url(uri);
++  if (!IsValidUrl(url)) {
++    error_ = kInvalidUriError;
++    return false;
++  }
++
++  std::string tld =
++      net::RegistryControlledDomainService::GetDomainAndRegistry(url);
++
++  result_.reset(Value::CreateStringValue(tld));
++
++  return true;
++}
++
++
++bool TldGetPublicSuffix::RunImpl() {
++  EXTENSION_FUNCTION_VALIDATE(args_->GetSize() == 2);
++
++  std::string uri;
++  EXTENSION_FUNCTION_VALIDATE(!args_->GetString(0, &uri));
++
++  // We might delegate all the url validity check to GetDomainAndRegistry
++  // or GetRegistryLength but try to be more explicit about the errors in
++  // some cases.
++  const GURL url(uri);
++  if (!IsValidUrl(url)) {
++    error_ = kInvalidUriError;
++    return false;
++  }
++
++  std::string suffix;
++
++  size_t reg_len =
++      net::RegistryControlledDomainService::GetRegistryLength(url, true);
++
++  if (std::string::npos == reg_len || 0 == reg_len)
++    return false;
++
++  std::string tld =
++      net::RegistryControlledDomainService::GetDomainAndRegistry(url);
++
++  if (!tld.empty () && tld.size() > reg_len)
++    suffix = tld.substr(tld.size() - reg_len - 1, reg_len);
++
++  // An empty suffix is a acceptable value since the URL might be
++  // "properly formed" but might fall into cases such as:
++  // * http://co.uk/file.html
++  // * http://<IP address>/file.html
++  // which are described by GetRegistryLength to return 0 (i.e. a valid value).
++  result_.reset(Value::CreateStringValue(suffix));
++
++  return true;
++}
++
++
+Index: src/chrome/browser/extensions/api/tld/tld_api.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/browser/extensions/api/tld/tld_api.h	2012-07-16 15:39:31.611655856 -0400
+@@ -0,0 +1,26 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef CHROME_BROWSER_EXTENSIONS_API_TLD_TLD_API_H_
++#define CHROME_BROWSER_EXTENSIONS_API_TLD_TLD_API_H_
++#pragma once
++
++#include "chrome/browser/extensions/extension_function.h"
++
++class TldGetBaseDomainFunction : public SyncExtensionFunction {
++ public:
++  virtual ~TldGetBaseDomainFunction() {}
++  virtual bool RunImpl() OVERRIDE;
++  DECLARE_EXTENSION_FUNCTION_NAME("tld.getBaseDomain");
++};
++
++class TldGetPublicSuffix : public SyncExtensionFunction {
++ public:
++  virtual ~TldGetPublicSuffix() {}
++  virtual bool RunImpl() OVERRIDE;
++  DECLARE_EXTENSION_FUNCTION_NAME("tld.getPublicSuffix");
++};
++
++#endif  // CHROME_BROWSER_EXTENSIONS_API_TLD_TLD_API_H_
++
+Index: src/chrome/browser/extensions/extension_function_registry.cc
+===================================================================
+--- src.orig/chrome/browser/extensions/extension_function_registry.cc	2012-07-07 00:59:55.000000000 -0400
++++ src/chrome/browser/extensions/extension_function_registry.cc	2012-07-16 15:40:22.239657522 -0400
+@@ -19,6 +19,7 @@
+ #include "chrome/browser/extensions/api/runtime/runtime_api.h"
+ #include "chrome/browser/extensions/api/serial/serial_api.h"
+ #include "chrome/browser/extensions/api/socket/socket_api.h"
++#include "chrome/browser/extensions/api/tld/tld_api.h"
+ #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
+ #include "chrome/browser/extensions/api/web_request/web_request_api.h"
+ #include "chrome/browser/extensions/execute_code_in_tab_function.h"
+@@ -166,6 +167,10 @@
+   RegisterFunction<MoveBookmarkFunction>();
+   RegisterFunction<UpdateBookmarkFunction>();
+ 
++  // TLD.
++  RegisterFunction<TldGetBaseDomainFunction>();
++  RegisterFunction<TldGetPublicSuffix>();
++
+   // Infobars.
+   RegisterFunction<ShowInfoBarFunction>();
+ 
+Index: src/chrome/chrome_browser_extensions.gypi
+===================================================================
+--- src.orig/chrome/chrome_browser_extensions.gypi	2012-07-07 01:00:10.000000000 -0400
++++ src/chrome/chrome_browser_extensions.gypi	2012-07-16 15:39:31.611655856 -0400
+@@ -156,6 +156,8 @@
+         'browser/extensions/api/terminal/terminal_extension_helper.h',
+         'browser/extensions/api/terminal/terminal_private_api.cc',
+         'browser/extensions/api/terminal/terminal_private_api.h',
++        'browser/extensions/api/tld/tld_api.cc',
++        'browser/extensions/api/tld/tld_api.h',
+         'browser/extensions/api/usb/usb_api.cc',
+         'browser/extensions/api/usb/usb_api.h',
+         'browser/extensions/api/usb/usb_device_resource.cc',
+Index: src/chrome/common/extensions_api_resources.grd
+===================================================================
+--- src.orig/chrome/common/extensions_api_resources.grd	2012-07-16 15:33:42.000000000 -0400
++++ src/chrome/common/extensions_api_resources.grd	2012-07-16 15:39:31.611655856 -0400
+@@ -63,6 +63,7 @@
+       <include name="IDR_EXTENSION_API_JSON_TABS" file="extensions\api\tabs.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_TERMINALPRIVATE" file="extensions\api\terminalPrivate.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_TEST" file="extensions\api\test.json" type="BINDATA" />
++      <include name="IDR_EXTENSION_API_JSON_TLD" file="extensions\api\tld.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_TOPSITES" file="extensions\api\topSites.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_TTS" file="extensions\api\tts.json" type="BINDATA" />
+       <include name="IDR_EXTENSION_API_JSON_TTSENGINE" file="extensions\api\ttsEngine.json" type="BINDATA" />
+Index: src/chrome/common/extensions/extension_permission_set.cc
+===================================================================
+--- src.orig/chrome/common/extensions/extension_permission_set.cc	2012-07-16 15:33:42.000000000 -0400
++++ src/chrome/common/extensions/extension_permission_set.cc	2012-07-16 15:40:49.303658414 -0400
+@@ -53,6 +53,7 @@
+   "pageActions",
+   "permissions",
+   "test",
++  "tld",
+   "types"
+ };
+ const size_t kNumNonPermissionModuleNames =
+Index: src/chrome/common/extensions/api/extension_api.cc
+===================================================================
+--- src.orig/chrome/common/extensions/api/extension_api.cc	2012-07-16 15:33:42.000000000 -0400
++++ src/chrome/common/extensions/api/extension_api.cc	2012-07-16 15:39:31.611655856 -0400
+@@ -369,6 +369,8 @@
+       IDR_EXTENSION_API_JSON_TERMINALPRIVATE));
+   RegisterSchema("test", ReadFromResource(
+       IDR_EXTENSION_API_JSON_TEST));
++  RegisterSchema("tld", ReadFromResource(
++      IDR_EXTENSION_API_JSON_TLD));
+   RegisterSchema("topSites", ReadFromResource(
+       IDR_EXTENSION_API_JSON_TOPSITES));
+   RegisterSchema("ttsEngine", ReadFromResource(
+Index: src/chrome/common/extensions/api/tld.json
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/common/extensions/api/tld.json	2012-07-16 15:39:31.615655856 -0400
+@@ -0,0 +1,53 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++[
++  {
++    "namespace": "tld",
++    "nodoc": "true",
++    "types": [],
++    "functions": [
++      {
++        "name": "getBaseDomain",
++        "type": "function",
++        "description": "Returns the base domain of a URI; that is, the public suffix with a given number of additional domain name parts.",
++        "nodoc": "true",
++        "parameters": [
++          {
++            "name": "uri",
++            "type": "string"
++          },
++          {
++            "type": "function",
++            "name": "callback",
++            "parameters": [
++              {"name": "domain", "type": "string", "description": "The base domain name of the associated URI if any"}
++            ]
++          }
++        ]
++      }
++      ,
++      {
++        "name": "getPublicSuffix",
++        "type": "function",
++        "description": "Returns the public suffix of the domain part of a URI.",
++        "nodoc": "true",
++        "parameters": [
++          {
++            "name": "uri",
++            "type": "string"
++          },
++          {
++            "type": "function",
++            "name": "callback",
++            "parameters": [
++              {"name": "suffix", "type": "string", "description": "The public suffix of the associated URI if any"}
++            ]
++          }
++        ]
++      }
++    ]
++  }
++
++]

=== added file 'debian/patches/3-chrome-xid.patch'
--- debian/patches/3-chrome-xid.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/3-chrome-xid.patch	2012-08-06 17:52:22 +0000
@@ -0,0 +1,38 @@
+Index: src/chrome/browser/ui/gtk/browser_window_gtk.cc
+===================================================================
+--- src.orig/chrome/browser/ui/gtk/browser_window_gtk.cc	2012-07-07 01:00:04.000000000 -0400
++++ src/chrome/browser/ui/gtk/browser_window_gtk.cc	2012-07-16 15:41:21.991659488 -0400
+@@ -150,6 +150,12 @@
+ // gtk_window_get_position() after the last GTK configure-event signal.
+ const int kDebounceTimeoutMilliseconds = 100;
+ 
++// A window property will be set to reflect the session_id of the
++//  associated browser window. The session_id is unique among browsers
++//  for a given session and actually corresponds to the window.id found
++//  in the extensions api.
++char kSessionIdPropertyName[] = "CHROMIUM_LINUX_SESSION_ID_PROPERTY";
++
+ // Ubuntu patches their verrsion of GTK+ so that there is always a
+ // gripper in the bottom right corner of the window. We dynamically
+ // look up this symbol because it's a non-standard Ubuntu extension to
+@@ -422,6 +428,20 @@
+     InitWidgets();
+   }
+ 
++  // Add a specific property to inform an interested third party
++  //  of our session id. Interesting in the context of an extension
++  //  where the session id corresponds to the window.id and is a way
++  //  to uniquely identify a window based on that (from within a given
++  //  extension).
++  gulong session_id = browser_->session_id().id();
++  gdk_property_change(GTK_WIDGET(window_)->window,
++		      gdk_atom_intern(kSessionIdPropertyName, FALSE),
++		      gdk_atom_intern("CARDINAL", FALSE),
++		      32,
++		      GDK_PROP_MODE_REPLACE,
++		      (guchar *)&session_id,
++		      1);
++
+   ConnectAccelerators();
+ 
+   // Set the initial background color of widgets.

=== added file 'debian/patches/arm.patch'
--- debian/patches/arm.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/arm.patch	2012-08-06 17:52:22 +0000
@@ -0,0 +1,50 @@
+Index: src/skia/skia.gyp
+===================================================================
+--- src.orig/skia/skia.gyp	2012-05-19 16:54:19.000000000 +0200
++++ src/skia/skia.gyp	2012-06-20 14:34:13.131318952 +0200
+@@ -1157,9 +1157,11 @@
+         [ 'target_arch == "arm" and armv7 != 1', {
+           'sources': [
+             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
++            '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
+           ],
+           'sources!': [
+             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
++            '../third_party/skia/src/opts/opts_check_arm.cpp',
+           ],
+         }],
+       ],
+Index: src/ui/base/resource/data_pack.cc
+===================================================================
+--- src.orig/ui/base/resource/data_pack.cc	2012-05-19 16:55:37.000000000 +0200
++++ src/ui/base/resource/data_pack.cc	2012-06-20 14:38:32.507316901 +0200
+@@ -130,9 +130,11 @@
+   // 2) Verify the entries are within the appropriate bounds. There's an extra
+   // entry after the last item which gives us the length of the last item.
+   for (size_t i = 0; i < resource_count_ + 1; ++i) {
++    uint32 t;
+     const DataPackEntry* entry = reinterpret_cast<const DataPackEntry*>(
+         mmap_->data() + kHeaderLength + (i * sizeof(DataPackEntry)));
+-    if (entry->file_offset > mmap_->length()) {
++    memcpy(&t, &entry->file_offset, 32/8);
++    if (t > mmap_->length()) {
+       LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
+                  << "Was the file corrupted?";
+       UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
+Index: src/v8/src/arm/macro-assembler-arm.cc
+===================================================================
+--- src.orig/v8/src/arm/macro-assembler-arm.cc	2012-05-19 16:57:27.000000000 +0200
++++ src/v8/src/arm/macro-assembler-arm.cc	2012-06-20 14:35:27.339318363 +0200
+@@ -61,9 +61,9 @@
+ // We do not support thumb inter-working with an arm architecture not supporting
+ // the blx instruction (below v5t).  If you know what CPU you are compiling for
+ // you can use -march=armv7 or similar.
+-#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
+-# error "For thumb inter-working we require an architecture which supports blx"
+-#endif
++//#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
++//# error "For thumb inter-working we require an architecture which supports blx"
++//#endif
+ 
+ 
+ // Using bx does not yield better code, so use it only when required

=== added file 'debian/patches/chromeless-window-launch-option.patch'
--- debian/patches/chromeless-window-launch-option.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/chromeless-window-launch-option.patch	2012-08-06 17:52:22 +0000
@@ -0,0 +1,860 @@
+Index: src/chrome/browser/ui/gtk/browser_window_gtk.cc
+===================================================================
+--- src.orig/chrome/browser/ui/gtk/browser_window_gtk.cc	2012-07-11 23:49:59.216259275 -0400
++++ src/chrome/browser/ui/gtk/browser_window_gtk.cc	2012-07-11 23:49:59.232259276 -0400
+@@ -412,6 +412,8 @@
+     SetWindowCustomClass(window_,
+                          std::string(gdk_get_program_class()) +
+                          " (" + user_data_dir + ")");
++  } else if (browser_->is_chromeless_mode()) {
++    SetWindowCustomClass(window_, web_app::GetWMClassFromAppName("chromeless"));
+   }
+ 
+   // For popups, we initialize widgets then set the window geometry, because
+@@ -980,7 +982,7 @@
+ }
+ 
+ void BrowserWindowGtk::SetFocusToLocationBar(bool select_all) {
+-  if (!IsFullscreen())
++  if (!IsFullscreen() && IsToolbarSupported())
+     GetLocationBar()->FocusLocation(select_all);
+ }
+ 
+@@ -2546,7 +2548,7 @@
+ 
+ bool BrowserWindowGtk::UseCustomFrame() const {
+   // We don't use the custom frame for app mode windows or app window popups.
+-  return use_custom_frame_pref_.GetValue() && !browser_->is_app();
++  return use_custom_frame_pref_.GetValue() && !browser_->is_app() && !browser_->is_chromeless_mode();
+ }
+ 
+ bool BrowserWindowGtk::BoundsMatchMonitorSize() {
+Index: src/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+===================================================================
+--- src.orig/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc	2012-07-07 01:00:04.000000000 -0400
++++ src/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc	2012-07-11 23:49:59.232259276 -0400
+@@ -777,9 +777,11 @@
+   g_signal_connect(tabstrip_.get(), "drag-data-received",
+                    G_CALLBACK(OnDragDataReceivedThunk), this);
+ 
+-  newtab_button_.reset(MakeNewTabButton());
+-  newtab_surface_bounds_.SetRect(0, 0, newtab_button_->SurfaceWidth(),
+-                                 newtab_button_->SurfaceHeight());
++  if (window_ && window_->browser() && ! window_->browser()->is_chromeless_mode()) {
++    newtab_button_.reset(MakeNewTabButton());
++    newtab_surface_bounds_.SetRect(0, 0, newtab_button_->SurfaceWidth(),
++                                   newtab_button_->SurfaceHeight());
++  }
+ 
+   gtk_widget_show_all(tabstrip_.get());
+ 
+@@ -1451,6 +1453,9 @@
+ 
+ void TabStripGtk::LayoutNewTabButton(double last_tab_right,
+                                      double unselected_width) {
++  if (window_ && window_->browser() && window_->browser()->is_chromeless_mode())
++    return;
++
+   GtkWidget* toplevel = gtk_widget_get_ancestor(widget(), GTK_TYPE_WINDOW);
+   bool is_maximized = false;
+   if (toplevel) {
+@@ -1504,8 +1509,10 @@
+   int available_width = tabstrip_allocation.width;
+   if (available_width_for_tabs_ < 0) {
+     available_width = bounds_.width();
+-    available_width -=
++    if (newtab_button_.get() != NULL) {
++      available_width -=
+         (kNewTabButtonHOffset + newtab_button_->WidgetAllocation().width);
++    }
+   } else {
+     // Interesting corner case: if |available_width_for_tabs_| > the result
+     // of the calculation in the conditional arm above, the strip is in
+@@ -2062,9 +2069,11 @@
+   event->area.height = bounds_.height();
+   gdk_region_union_with_rect(event->region, &event->area);
+ 
+-  // Paint the New Tab button.
+-  gtk_container_propagate_expose(GTK_CONTAINER(tabstrip_.get()),
+-      newtab_button_->widget(), event);
++  if (newtab_button_.get() != NULL) {
++    // Paint the New Tab button.
++    gtk_container_propagate_expose(GTK_CONTAINER(tabstrip_.get()),
++                                   newtab_button_->widget(), event);
++  }
+ 
+   // Paint the tabs in reverse order, so they stack to the left.
+   TabGtk* selected_tab = NULL;
+@@ -2257,6 +2266,9 @@
+ }
+ 
+ void TabStripGtk::SetNewTabButtonBackground() {
++  if (newtab_button_.get() == NULL) {
++    return;
++  }
+   SkColor color = theme_service_->GetColor(
+       ThemeService::COLOR_BUTTON_BACKGROUND);
+   SkBitmap* background = theme_service_->GetBitmapNamed(
+Index: src/chrome/browser/ui/browser.h
+===================================================================
+--- src.orig/chrome/browser/ui/browser.h	2012-07-07 01:00:04.000000000 -0400
++++ src/chrome/browser/ui/browser.h	2012-07-11 23:49:59.236259276 -0400
+@@ -194,6 +194,9 @@
+   // window is created by this function call.
+   static Browser* Create(Profile* profile);
+ 
++  // Like Create, but creates a chromeless browser.
++  static Browser* CreateChromeless(Profile * profile);
++
+   // Like Create, but creates a browser of the specified parameters.
+   static Browser* CreateWithParams(const CreateParams& params);
+ 
+@@ -868,6 +871,7 @@
+   bool is_type_popup() const { return type_ == TYPE_POPUP; }
+   bool is_type_panel() const { return type_ == TYPE_PANEL; }
+ 
++  bool is_chromeless_mode() const;
+   bool is_app() const;
+   bool is_devtools() const;
+ 
+@@ -1355,6 +1359,8 @@
+   // Type of app (host or child). See description of AppType.
+   AppType app_type_;
+ 
++  bool is_chromeless_mode_;
++
+   // Unique identifier of this browser for session restore. This id is only
+   // unique within the current session, and is not guaranteed to be unique
+   // across sessions.
+Index: src/chrome/browser/ui/browser_init.h
+===================================================================
+--- src.orig/chrome/browser/ui/browser_init.h	2012-07-07 01:00:03.000000000 -0400
++++ src/chrome/browser/ui/browser_init.h	2012-07-11 23:49:59.236259276 -0400
+@@ -159,6 +159,11 @@
+     FRIEND_TEST_ALL_PREFIXES(BrowserTest, RestorePinnedTabs);
+     FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
+ 
++    // If the process was launched with the chromeless command line flag,
++    // e.g. --chromeless=http://www.google.com/ return true.
++    // In this case |url| is populated if they're non-null.
++    bool IsChromelessLaunch(std::string* url);
++
+     // If the process was launched with the web application command line flags,
+     // e.g. --app=http://www.google.com/ or --app_id=... return true.
+     // In this case |app_url| or |app_id| are populated if they're non-null.
+Index: src/chrome/browser/ui/browser_init.cc
+===================================================================
+--- src.orig/chrome/browser/ui/browser_init.cc	2012-07-07 01:00:08.000000000 -0400
++++ src/chrome/browser/ui/browser_init.cc	2012-07-11 23:49:59.236259276 -0400
+@@ -972,6 +972,16 @@
+   return true;
+ }
+ 
++bool BrowserInit::LaunchWithProfile::IsChromelessLaunch(std::string* url)
++{
++  if (command_line_.HasSwitch(switches::kChromeless)) {
++    if (url)
++      *url = command_line_.GetSwitchValueASCII(switches::kChromeless);
++    return true;
++  }
++  return false;
++}
++
+ bool BrowserInit::LaunchWithProfile::IsAppLaunch(std::string* app_url,
+                                                  std::string* app_id) {
+   if (command_line_.HasSwitch(switches::kApp)) {
+@@ -1084,6 +1094,12 @@
+     return;
+   }
+ 
++  if (IsChromelessLaunch(NULL)) {
++    // Open user-specified URLs like pinned tabs and startup tabs.
++    if (ProcessSpecifiedURLs(urls_to_open))
++      return;
++  }
++
+   if (process_startup && ProcessStartupURLs(urls_to_open)) {
+     // ProcessStartupURLs processed the urls, nothing else to do.
+     return;
+@@ -1179,7 +1195,8 @@
+   // mode. Also, no pages should be opened automatically if the session
+   // crashed. Otherwise it might trigger another crash, locking the user out of
+   // chrome. The crash infobar is shown in this case.
+-  if (!IncognitoModePrefs::ShouldLaunchIncognito(command_line_,
++  if (!IsChromelessLaunch(NULL) &&
++      !IncognitoModePrefs::ShouldLaunchIncognito(command_line_,
+                                                  profile_->GetPrefs()) &&
+       !HasPendingUncleanExit(profile_)) {
+     tabs = PinnedTabCodec::ReadPinnedTabs(profile_);
+@@ -1256,6 +1273,11 @@
+   if (!profile_ && browser)
+     profile_ = browser->profile();
+ 
++  if (IsChromelessLaunch(NULL)) {
++    g_message("OPenTabsInBrowser: %p chromeless create", browser);
++    browser = Browser::CreateChromeless(profile_);
++  }
++
+   if (!browser || !browser->is_type_tabbed()) {
+     browser = Browser::Create(profile_);
+   } else {
+@@ -1325,6 +1347,13 @@
+   if (!browser || !profile_ || browser->tab_count() == 0)
+     return;
+ 
++  // We consider that being in a chromeless launch, we are to minimize as much as
++  // possible the most obvious "classic" Chromium behavior.
++  if (IsChromelessLaunch(NULL))
++    {
++      return;
++    }
++
+   TabContentsWrapper* tab_contents = browser->GetSelectedTabContentsWrapper();
+   AddCrashedInfoBarIfNecessary(browser, tab_contents);
+ 
+Index: src/chrome/browser/ui/gtk/global_menu_bar.cc
+===================================================================
+--- src.orig/chrome/browser/ui/gtk/global_menu_bar.cc	2012-07-07 01:00:04.000000000 -0400
++++ src/chrome/browser/ui/gtk/global_menu_bar.cc	2012-07-11 23:49:59.236259276 -0400
+@@ -23,35 +23,43 @@
+ #include "ui/base/gtk/menu_label_accelerator_util.h"
+ #include "ui/base/l10n/l10n_util.h"
+ 
++typedef bool (*GlobalMenuBarVisibilityHandler) (Browser * browser);
++
+ struct GlobalMenuBarCommand {
+   int str_id;
+   int command;
+   int tag;
++  GlobalMenuBarVisibilityHandler visibility_handler;
+ };
+ 
+ namespace {
+ 
++static bool GlobalMenuBarVisibilityHandler_NotInChromelessMode(
++    Browser * browser) {
++  return browser && !browser->is_chromeless_mode();
++}
++
+ const int MENU_SEPARATOR =-1;
+ const int MENU_END = -2;
+ const int MENU_DISABLED_LABEL = -3;
+ 
+ GlobalMenuBarCommand file_menu[] = {
+-  { IDS_NEW_TAB, IDC_NEW_TAB },
+-  { IDS_NEW_WINDOW, IDC_NEW_WINDOW },
+-  { IDS_NEW_INCOGNITO_WINDOW, IDC_NEW_INCOGNITO_WINDOW },
+-  { IDS_REOPEN_CLOSED_TABS_LINUX, IDC_RESTORE_TAB },
+-  { IDS_OPEN_FILE_LINUX, IDC_OPEN_FILE },
+-  { IDS_OPEN_LOCATION_LINUX, IDC_FOCUS_LOCATION },
++  { IDS_NEW_TAB, IDC_NEW_TAB, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_NEW_WINDOW, IDC_NEW_WINDOW, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_NEW_INCOGNITO_WINDOW, IDC_NEW_INCOGNITO_WINDOW, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_REOPEN_CLOSED_TABS_LINUX, IDC_RESTORE_TAB, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_OPEN_FILE_LINUX, IDC_OPEN_FILE, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_OPEN_LOCATION_LINUX, IDC_FOCUS_LOCATION, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { MENU_SEPARATOR, MENU_SEPARATOR },
++  { MENU_SEPARATOR, MENU_SEPARATOR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { IDS_CREATE_SHORTCUTS, IDC_CREATE_SHORTCUTS },
++  { IDS_CREATE_SHORTCUTS, IDC_CREATE_SHORTCUTS, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { MENU_SEPARATOR, MENU_SEPARATOR },
++  { MENU_SEPARATOR, MENU_SEPARATOR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+   { IDS_CLOSE_WINDOW_LINUX, IDC_CLOSE_WINDOW },
+   { IDS_CLOSE_TAB_LINUX, IDC_CLOSE_TAB },
+-  { IDS_SAVE_PAGE, IDC_SAVE_PAGE },
++  { IDS_SAVE_PAGE, IDC_SAVE_PAGE, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+   { MENU_SEPARATOR, MENU_SEPARATOR },
+ 
+@@ -69,17 +77,17 @@
+ 
+   { IDS_FIND, IDC_FIND },
+ 
+-  { MENU_SEPARATOR, MENU_SEPARATOR },
++  { MENU_SEPARATOR, MENU_SEPARATOR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { IDS_PREFERENCES, IDC_OPTIONS },
++  { IDS_PREFERENCES, IDC_OPTIONS, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+   { MENU_END, MENU_END }
+ };
+ 
+ GlobalMenuBarCommand view_menu[] = {
+-  { IDS_SHOW_BOOKMARK_BAR, IDC_SHOW_BOOKMARK_BAR },
++  { IDS_SHOW_BOOKMARK_BAR, IDC_SHOW_BOOKMARK_BAR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { MENU_SEPARATOR, MENU_SEPARATOR },
++  { MENU_SEPARATOR, MENU_SEPARATOR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+   { IDS_STOP_MENU_LINUX, IDC_STOP },
+   { IDS_RELOAD_MENU_LINUX, IDC_RELOAD },
+@@ -95,48 +103,48 @@
+ };
+ 
+ GlobalMenuBarCommand history_menu[] = {
+-  { IDS_HISTORY_HOME_LINUX, IDC_HOME },
+-  { IDS_HISTORY_BACK_LINUX, IDC_BACK },
+-  { IDS_HISTORY_FORWARD_LINUX, IDC_FORWARD },
++  { IDS_HISTORY_HOME_LINUX, IDC_HOME, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_HISTORY_BACK_LINUX, IDC_BACK, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_HISTORY_FORWARD_LINUX, IDC_FORWARD, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { MENU_SEPARATOR, MENU_SEPARATOR },
++  { MENU_SEPARATOR, MENU_SEPARATOR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+   { IDS_HISTORY_VISITED_LINUX, MENU_DISABLED_LABEL,
+-    GlobalMenuBar::TAG_MOST_VISITED_HEADER },
++    GlobalMenuBar::TAG_MOST_VISITED_HEADER, GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { MENU_SEPARATOR, MENU_SEPARATOR },
++  { MENU_SEPARATOR, MENU_SEPARATOR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+   { IDS_HISTORY_CLOSED_LINUX, MENU_DISABLED_LABEL,
+-    GlobalMenuBar::TAG_RECENTLY_CLOSED_HEADER },
++    GlobalMenuBar::TAG_RECENTLY_CLOSED_HEADER, GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { MENU_SEPARATOR, MENU_SEPARATOR },
++  { MENU_SEPARATOR, MENU_SEPARATOR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { IDS_SHOWFULLHISTORY_LINK, IDC_SHOW_HISTORY },
++  { IDS_SHOWFULLHISTORY_LINK, IDC_SHOW_HISTORY, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+   { MENU_END, MENU_END }
+ };
+ 
+ GlobalMenuBarCommand tools_menu[] = {
+-  { IDS_SHOW_DOWNLOADS, IDC_SHOW_DOWNLOADS },
+-  { IDS_SHOW_HISTORY, IDC_SHOW_HISTORY },
+-  { IDS_SHOW_EXTENSIONS, IDC_MANAGE_EXTENSIONS },
++  { IDS_SHOW_DOWNLOADS, IDC_SHOW_DOWNLOADS, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_SHOW_HISTORY, IDC_SHOW_HISTORY, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_SHOW_EXTENSIONS, IDC_MANAGE_EXTENSIONS, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { MENU_SEPARATOR, MENU_SEPARATOR },
++  { MENU_SEPARATOR, MENU_SEPARATOR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { IDS_TASK_MANAGER, IDC_TASK_MANAGER },
+-  { IDS_CLEAR_BROWSING_DATA, IDC_CLEAR_BROWSING_DATA },
++  { IDS_TASK_MANAGER, IDC_TASK_MANAGER, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_CLEAR_BROWSING_DATA, IDC_CLEAR_BROWSING_DATA, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { MENU_SEPARATOR, MENU_SEPARATOR },
++  { MENU_SEPARATOR, MENU_SEPARATOR, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+-  { IDS_VIEW_SOURCE, IDC_VIEW_SOURCE },
+-  { IDS_DEV_TOOLS, IDC_DEV_TOOLS },
+-  { IDS_DEV_TOOLS_CONSOLE, IDC_DEV_TOOLS_CONSOLE },
++  { IDS_VIEW_SOURCE, IDC_VIEW_SOURCE, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_DEV_TOOLS, IDC_DEV_TOOLS, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
++  { IDS_DEV_TOOLS_CONSOLE, IDC_DEV_TOOLS_CONSOLE, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+ 
+   { MENU_END, MENU_END }
+ };
+ 
+ GlobalMenuBarCommand help_menu[] = {
+-  { IDS_FEEDBACK, IDC_FEEDBACK },
++  { IDS_FEEDBACK, IDC_FEEDBACK, int(), GlobalMenuBarVisibilityHandler_NotInChromelessMode },
+   { IDS_HELP_PAGE , IDC_HELP_PAGE },
+   { MENU_END, MENU_END }
+ };
+@@ -190,8 +198,10 @@
+   }
+ 
+   pref_change_registrar_.Init(browser_->profile()->GetPrefs());
+-  pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
+-  OnBookmarkBarVisibilityChanged();
++  if (! browser_->is_chromeless_mode()) {
++    pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
++    OnBookmarkBarVisibilityChanged();
++  }
+ }
+ 
+ GlobalMenuBar::~GlobalMenuBar() {
+@@ -214,8 +224,22 @@
+     std::map<int, GtkWidget*>* id_to_menu_item,
+     GlobalMenuBarCommand* commands,
+     GlobalMenuOwner* owner) {
++  // first pass to count the number of "visible" items
++  size_t count = 0;
++  for (int i = 0; commands[i].str_id != MENU_END; ++i) {
++    if (!commands[i].visibility_handler || commands[i].visibility_handler(browser_)) {
++      count++;
++    }
++  }
++  if (0 == count) {
++    return;
++  }
++
+   GtkWidget* menu = gtk_menu_new();
+   for (int i = 0; commands[i].str_id != MENU_END; ++i) {
++    if (commands[i].visibility_handler && !commands[i].visibility_handler(browser_)) {
++      continue;
++    }
+     GtkWidget* menu_item = BuildMenuItem(
+         commands[i].str_id, commands[i].command, commands[i].tag,
+         id_to_menu_item, menu);
+Index: src/chrome/browser/ui/browser.cc
+===================================================================
+--- src.orig/chrome/browser/ui/browser.cc	2012-07-07 01:00:04.000000000 -0400
++++ src/chrome/browser/ui/browser.cc	2012-07-12 01:02:11.796401815 -0400
+@@ -375,6 +375,7 @@
+       ALLOW_THIS_IN_INITIALIZER_LIST(
+           tab_strip_model_(new TabStripModel(this, profile))),
+       command_updater_(this),
++      is_chromeless_mode_(false),
+       app_type_(APP_TYPE_HOST),
+       chrome_updater_factory_(this),
+       is_attempting_to_close_browser_(false),
+@@ -538,6 +539,15 @@
+ }
+ 
+ // static
++Browser* Browser::CreateChromeless(Profile * profile)
++{
++  Browser* browser = new Browser(TYPE_TABBED, profile);
++  browser->is_chromeless_mode_ = true;
++  browser->InitBrowserWindow();
++  return browser;
++}
++
++// static
+ Browser* Browser::CreateWithParams(const CreateParams& params) {
+   if (!params.app_name.empty())
+     RegisterAppPrefs(params.app_name, params.profile);
+@@ -624,6 +634,10 @@
+   return find_bar_controller_.get() != NULL;
+ }
+ 
++bool Browser::is_chromeless_mode () const {
++  return is_chromeless_mode_;
++}
++
+ bool Browser::is_app() const {
+   return !app_name_.empty();
+ }
+@@ -1162,7 +1176,7 @@
+ #else
+   int string_id = IDS_BROWSER_WINDOW_TITLE_FORMAT;
+   // Don't append the app name to window titles on app frames and app popups
+-  if (is_app())
++  if (is_app() || is_chromeless_mode())
+     string_id = IDS_BROWSER_WINDOW_TITLE_FORMAT_NO_LOGO;
+   return l10n_util::GetStringFUTF16(string_id, title);
+ #endif
+@@ -1230,7 +1244,7 @@
+     tab_restore_service->BrowserClosing(tab_restore_service_delegate());
+ #endif
+ 
+-  if (tab_restore_service && is_type_tabbed() && tab_count())
++  if (tab_restore_service && is_type_tabbed() && !is_chromeless_mode() && tab_count())
+     tab_restore_service->BrowserClosing(tab_restore_service_delegate());
+ 
+   // TODO(sky): convert session/tab restore to use notification.
+@@ -1683,6 +1697,9 @@
+ void Browser::NewTab() {
+   content::RecordAction(UserMetricsAction("NewTab"));
+ 
++  if (is_chromeless_mode())
++    return;
++
+   if (is_type_tabbed()) {
+     AddBlankTab(true);
+     GetSelectedWebContents()->GetView()->RestoreFocus();
+@@ -2962,7 +2979,8 @@
+ 
+ void Browser::TabRestoreServiceChanged(TabRestoreService* service) {
+   command_updater_.UpdateCommandEnabled(IDC_RESTORE_TAB,
+-                                        !service->entries().empty());
++                                        !service->entries().empty()
++                                          && !is_chromeless_mode());
+ }
+ 
+ void Browser::TabRestoreServiceDestroyed(TabRestoreService* service) {
+@@ -3124,7 +3142,7 @@
+ void Browser::CreateHistoricalTab(TabContentsWrapper* contents) {
+   // We don't create historical tabs for incognito windows or windows without
+   // profiles.
+-  if (!profile() || profile()->IsOffTheRecord())
++  if (!profile() || profile()->IsOffTheRecord() || is_chromeless_mode())
+     return;
+ 
+   // We don't create historical tabs for print preview tabs.
+@@ -3833,7 +3851,7 @@
+     const history::HistoryAddPageArgs& add_page_args,
+     content::NavigationType navigation_type) {
+   // Don't update history if running as app.
+-  return !IsApplication();
++  return !IsApplication() && !is_chromeless_mode();
+ }
+ 
+ bool Browser::ShouldCreateWebContents(
+@@ -4377,6 +4395,8 @@
+   // All browser commands whose state isn't set automagically some other way
+   // (like Back & Forward with initial page load) must have their state
+   // initialized here, otherwise they will be forever disabled.
++  bool started_in_chromeless =
++    CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeless);
+ 
+   // Navigation commands
+   command_updater_.UpdateCommandEnabled(IDC_RELOAD, true);
+@@ -4384,10 +4404,10 @@
+ 
+   // Window management commands
+   command_updater_.UpdateCommandEnabled(IDC_CLOSE_WINDOW, true);
+-  command_updater_.UpdateCommandEnabled(IDC_NEW_TAB, true);
++  command_updater_.UpdateCommandEnabled(IDC_NEW_TAB, !started_in_chromeless);
+   command_updater_.UpdateCommandEnabled(IDC_CLOSE_TAB, true);
+-  command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB, true);
+-  command_updater_.UpdateCommandEnabled(IDC_RESTORE_TAB, false);
++  command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB, !started_in_chromeless);
++  command_updater_.UpdateCommandEnabled(IDC_RESTORE_TAB, !started_in_chromeless);
+   command_updater_.UpdateCommandEnabled(IDC_EXIT, true);
+   command_updater_.UpdateCommandEnabled(IDC_DEBUG_FRAME_TOGGLE, true);
+ 
+@@ -4442,23 +4462,27 @@
+   UpdateOpenFileState();
+   command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
+   UpdateCommandsForDevTools();
+-  command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true);
+-  command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
+-  command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
++  command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, !started_in_chromeless);
++  command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, !started_in_chromeless);
++  command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, !started_in_chromeless);
+   command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true);
+-  command_updater_.UpdateCommandEnabled(IDC_BOOKMARKS_MENU, true);
++  command_updater_.UpdateCommandEnabled(IDC_BOOKMARKS_MENU, !started_in_chromeless);
+ 
+ #if defined(OS_CHROMEOS)
+   command_updater_.UpdateCommandEnabled(IDC_SHOW_KEYBOARD_OVERLAY, true);
+ #endif
+   command_updater_.UpdateCommandEnabled(
+-      IDC_SHOW_SYNC_SETUP, profile_->GetOriginalProfile()->IsSyncAccessible());
++      IDC_SHOW_SYNC_SETUP,
++      profile_->GetOriginalProfile()->IsSyncAccessible()
++        && !started_in_chromeless);
+ 
+   // Initialize other commands based on the window type.
+   bool normal_window = is_type_tabbed();
+ 
+   // Navigation commands
+-  command_updater_.UpdateCommandEnabled(IDC_HOME, normal_window);
++  command_updater_.UpdateCommandEnabled(IDC_HOME,
++                                        normal_window
++                                          && !started_in_chromeless);
+ 
+   // Window management commands
+   // TODO(rohitrao): Disable fullscreen on non-Lion?
+@@ -4493,7 +4517,9 @@
+   command_updater_.UpdateCommandEnabled(IDC_FIND_PREVIOUS, !is_devtools());
+ 
+   // Show various bits of UI
+-  command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, normal_window);
++  command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
++                                        normal_window &&
++                                          !started_in_chromeless);
+ 
+   // The upgrade entry and the view incompatibility entry should always be
+   // enabled. Whether they are visible is a separate matter determined on menu
+@@ -4519,14 +4545,20 @@
+ }
+ 
+ void Browser::UpdateCommandsForIncognitoAvailability() {
++  bool started_in_chromeless =
++    CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeless)
++    || is_chromeless_mode();
++
+   IncognitoModePrefs::Availability incognito_availability =
+       IncognitoModePrefs::GetAvailability(profile_->GetPrefs());
+   command_updater_.UpdateCommandEnabled(
+       IDC_NEW_WINDOW,
+-      incognito_availability != IncognitoModePrefs::FORCED);
++      incognito_availability != IncognitoModePrefs::FORCED &&
++        !started_in_chromeless);
+   command_updater_.UpdateCommandEnabled(
+       IDC_NEW_INCOGNITO_WINDOW,
+-      incognito_availability != IncognitoModePrefs::DISABLED);
++      incognito_availability != IncognitoModePrefs::DISABLED &&
++        !started_in_chromeless);
+ 
+   // Bookmark manager and settings page/subpages are forced to open in normal
+   // mode. For this reason we disable these commands when incognito is forced.
+@@ -4534,18 +4566,22 @@
+       incognito_availability != IncognitoModePrefs::FORCED;
+   command_updater_.UpdateCommandEnabled(
+       IDC_SHOW_BOOKMARK_MANAGER,
+-      browser_defaults::bookmarks_enabled && command_enabled);
++      browser_defaults::bookmarks_enabled &&
++      command_enabled && !started_in_chromeless);
+   ExtensionService* extension_service = profile()->GetExtensionService();
+   bool enable_extensions =
+       extension_service && extension_service->extensions_enabled();
+   command_updater_.UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS,
+-                                        enable_extensions && command_enabled);
++                                        enable_extensions && command_enabled
++                                          && !started_in_chromeless);
+ 
+   const bool show_main_ui = IsShowingMainUI(window_ && window_->IsFullscreen());
+   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS,
+-                                        show_main_ui && command_enabled);
++                                        show_main_ui && command_enabled
++                                          && !started_in_chromeless);
+   command_updater_.UpdateCommandEnabled(IDC_OPTIONS,
+-                                        show_main_ui && command_enabled);
++                                        show_main_ui && command_enabled
++                                          && !started_in_chromeless);
+ }
+ 
+ void Browser::UpdateCommandsForTabState() {
+@@ -4565,16 +4601,19 @@
+ 
+   // Window management commands
+   command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB,
+-      !is_app() && CanDuplicateContentsAt(active_index()));
++      !is_chromeless_mode() && !is_app()
++      && CanDuplicateContentsAt(active_index()));
+ 
+   // Page-related commands
+   window_->SetStarredState(
+       current_tab_wrapper->bookmark_tab_helper()->is_starred());
+   command_updater_.UpdateCommandEnabled(IDC_VIEW_SOURCE,
+-      current_tab->GetController().CanViewSource());
++      current_tab->GetController().CanViewSource()
++        && !is_chromeless_mode());
+   command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION,
+-      toolbar_model_->ShouldDisplayURL() && current_tab->GetURL().is_valid());
+-  if (is_devtools())
++      toolbar_model_->ShouldDisplayURL() && current_tab->GetURL().is_valid()
++      && !is_chromeless_mode());
++  if (is_devtools() || is_chromeless_mode())
+       command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, false);
+ 
+   // Changing the encoding is not possible on Chrome-internal webpages.
+@@ -4588,7 +4627,8 @@
+   // on the Mac. Be sure to remove both ifdefs. http://crbug.com/13148
+ #if !defined(OS_MACOSX)
+   command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS,
+-      web_app::IsValidUrl(current_tab->GetURL()));
++      web_app::IsValidUrl(current_tab->GetURL())
++        && !is_chromeless_mode());
+ #endif
+ 
+   UpdateCommandsForContentRestrictionState();
+@@ -4620,9 +4660,14 @@
+ }
+ 
+ void Browser::UpdateCommandsForBookmarkEditing() {
++  bool started_in_chromeless =
++    CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeless)
++    || is_chromeless_mode();
++
+   bool enabled =
+       profile_->GetPrefs()->GetBoolean(prefs::kEditBookmarksEnabled) &&
+-      browser_defaults::bookmarks_enabled;
++      browser_defaults::bookmarks_enabled &&
++      !started_in_chromeless;
+ 
+   command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE,
+       enabled && is_type_tabbed());
+@@ -4748,7 +4793,12 @@
+   if (local_state)
+     enabled = local_state->GetBoolean(prefs::kAllowFileSelectionDialogs);
+ 
+-  command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, enabled);
++  bool started_in_chromeless =
++    CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeless)
++    || is_chromeless_mode();
++
++  command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE,
++                                        enabled && !started_in_chromeless);
+ }
+ 
+ void Browser::UpdateReloadStopState(bool is_loading, bool force) {
+@@ -4863,7 +4913,8 @@
+ // on the Mac. Be sure to remove both ifdefs. http://crbug.com/13148
+ #if !defined(OS_MACOSX)
+         command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS,
+-            web_app::IsValidUrl(contents->GetURL()));
++            web_app::IsValidUrl(contents->GetURL())
++              && !is_chromeless_mode());
+ #endif
+         window_->UpdateTitleBar();
+       }
+@@ -5211,20 +5262,20 @@
+ 
+   unsigned int features = FEATURE_INFOBAR | FEATURE_DOWNLOADSHELF;
+ 
+-  if (is_type_tabbed())
++  if (is_type_tabbed() && !is_chromeless_mode())
+     features |= FEATURE_BOOKMARKBAR;
+ 
+   if (!hide_ui_for_fullscreen) {
+-    if (!is_type_tabbed())
++    if (!is_type_tabbed() && !is_chromeless_mode())
+       features |= FEATURE_TITLEBAR;
+ 
+     if (is_type_tabbed())
+       features |= FEATURE_TABSTRIP;
+ 
+-    if (is_type_tabbed())
++    if (is_type_tabbed() && !is_chromeless_mode())
+       features |= FEATURE_TOOLBAR;
+ 
+-    if (!is_app())
++    if (!is_app() && !is_chromeless_mode())
+       features |= FEATURE_LOCATIONBAR;
+   }
+   return !!(features & feature);
+Index: src/chrome/browser/extensions/extension_module.h
+===================================================================
+--- src.orig/chrome/browser/extensions/extension_module.h	2012-07-07 00:59:55.000000000 -0400
++++ src/chrome/browser/extensions/extension_module.h	2012-07-11 23:49:59.240259276 -0400
+@@ -46,4 +46,10 @@
+   virtual bool RunImpl() OVERRIDE;
+ };
+ 
++class IsChromelessWindowFunction : public SyncExtensionFunction {
++ protected:
++  virtual bool RunImpl() OVERRIDE;
++  DECLARE_EXTENSION_FUNCTION_NAME("extension.isChromelessWindow");
++};
++
+ #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_MODULE_H__
+Index: src/chrome/browser/extensions/extension_module.cc
+===================================================================
+--- src.orig/chrome/browser/extensions/extension_module.cc	2012-07-07 00:59:55.000000000 -0400
++++ src/chrome/browser/extensions/extension_module.cc	2012-07-11 23:49:59.240259276 -0400
+@@ -6,9 +6,27 @@
+ 
+ #include <string>
+ 
++#if defined(OS_LINUX) && defined(TOOLKIT_GTK)
++#include <gdk/gdk.h>
++#include <gdk/gdkx.h>
++#endif
++
+ #include "chrome/browser/extensions/extension_prefs.h"
+ #include "chrome/browser/extensions/extension_service.h"
++#include "chrome/browser/ui/browser.h"
++#include "chrome/browser/ui/browser_window.h"
+ #include "chrome/browser/profiles/profile.h"
++#include "chrome/common/chrome_switches.h"
++
++#if defined(OS_LINUX) && defined(TOOLKIT_GTK)
++
++namespace {
++
++const char kNoCurrentWindowError[] = "No current window";
++
++} // namespace {
++
++#endif
+ 
+ ExtensionPrefs* SetUpdateUrlDataFunction::extension_prefs() {
+   return profile()->GetExtensionService()->extension_prefs();
+@@ -39,3 +57,18 @@
+         ext_service->AllowFileAccess(extension)));
+   return true;
+ }
++
++bool IsChromelessWindowFunction::RunImpl() {
++  Browser* browser = GetCurrentBrowser();
++  if (!browser || !browser->window() || !browser->window()->GetNativeHandle()) {
++    error_ = kNoCurrentWindowError;
++    return false;
++  }
++  // TODO: quite brittle, what about tab moves/undock?
++  // rather rely on proper browser_window type.
++  // TODO: should be run on a specific thread?
++  const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
++  result_.reset(Value::CreateBooleanValue(
++      browser_command_line.HasSwitch(switches::kChromeless)));
++  return true;
++}
+Index: src/chrome/common/extensions/api/extension.json
+===================================================================
+--- src.orig/chrome/common/extensions/api/extension.json	2012-07-07 01:01:17.000000000 -0400
++++ src/chrome/common/extensions/api/extension.json	2012-07-11 23:49:59.240259276 -0400
+@@ -205,6 +205,24 @@
+         }
+       },
+       {
++        "name": "isChromelessWindow",
++        "type": "function",
++        "description": "Checks is a given extension runs part of a chromeless window.",
++        "parameters": [
++          {
++            "type": "function",
++            "name": "callback",
++            "parameters": [
++              {
++                "name": "isChromelessWindow",
++                "type": "boolean",
++                "description": "True if the extension runs part of a chromeless window, false otherwise."
++              }
++            ]
++          }
++        ]
++      },
++      {
+         "name": "isAllowedIncognitoAccess",
+         "type": "function",
+         "description": "Retrieves the state of the extension's access to Incognito-mode (as determined by the user-controlled 'Allowed in Incognito' checkbox.",
+Index: src/chrome/common/chrome_switches.h
+===================================================================
+--- src.orig/chrome/common/chrome_switches.h	2012-07-07 01:01:17.000000000 -0400
++++ src/chrome/common/chrome_switches.h	2012-07-11 23:49:59.244259276 -0400
+@@ -53,6 +53,7 @@
+ extern const char kCheckForUpdateIntervalSec[];
+ extern const char kCheckCloudPrintConnectorPolicy[];
+ extern const char kChromeFrameShutdownDelay[];
++extern const char kChromeless[];
+ extern const char kChromeVersion[];
+ extern const char kCipherSuiteBlacklist[];
+ extern const char kClearTokenService[];
+Index: src/chrome/common/chrome_switches.cc
+===================================================================
+--- src.orig/chrome/common/chrome_switches.cc	2012-07-07 01:01:18.000000000 -0400
++++ src/chrome/common/chrome_switches.cc	2012-07-11 23:49:59.244259276 -0400
+@@ -138,6 +138,9 @@
+ // Chrome Frame automation channel is closed.
+ const char kChromeFrameShutdownDelay[]      = "chrome-frame-shutdown-delay";
+ 
++// Specifies a given URL to be opened in a chromeless mode.
++const char kChromeless[]                    = "chromeless";
++
+ // Tells chrome to load the specified version of chrome.dll on Windows. If this
+ // version cannot be loaded, Chrome will exit.
+ const char kChromeVersion[]                 = "chrome-version";
+alex@alex-Gazelle-Professional:~/dev/work/chromium/r20.0.1132.47/src$ svn diff chrome/browser/sessions/session_service.cc
+Index: chrome/browser/sessions/session_service.cc
+===================================================================
+--- src.orig/chrome/browser/sessions/session_service.cc	(revision 136242)
++++ src/chrome/browser/sessions/session_service.cc	(working copy)
+@@ -32,6 +32,7 @@
+ #include "chrome/browser/ui/browser_window.h"
+ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+ #include "chrome/common/chrome_notification_types.h"
++#include "chrome/common/chrome_switches.h"
+ #include "chrome/common/extensions/extension.h"
+ #include "content/public/browser/navigation_details.h"
+ #include "content/public/browser/navigation_entry.h"
+@@ -579,6 +580,14 @@
+       if (browser->profile() != profile() ||
+           !should_track_changes_for_browser_type(browser->type(), app_type))
+         return;
++      
++      // Do not track changes for chromeless windows so that
++      // it won't be considered for restoration during a 'normal' browser
++      // instance.
++      if (browser->is_chromeless_mode() ||
++          CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeless)) {
++        return;
++      }
+ 
+       RestoreIfNecessary(std::vector<GURL>(), browser);
+       SetWindowType(browser->session_id(), browser->type(), app_type);

=== added file 'debian/patches/desktop-integration-settings.patch'
--- debian/patches/desktop-integration-settings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/desktop-integration-settings.patch	2012-08-06 17:52:22 +0000
@@ -0,0 +1,1031 @@
+Index: src/chrome/chrome_browser.gypi
+===================================================================
+--- src.orig/chrome/chrome_browser.gypi	2012-07-31 14:30:37.000000000 -0400
++++ src/chrome/chrome_browser.gypi	2012-07-31 14:34:57.786804291 -0400
+@@ -3803,6 +3803,8 @@
+         'browser/ui/webui/options2/cookies_view_handler2.h',
+         'browser/ui/webui/options2/core_options_handler2.cc',
+         'browser/ui/webui/options2/core_options_handler2.h',
++        'browser/ui/webui/options2/desktop_integration_settings_handler2.cc',
++        'browser/ui/webui/options2/desktop_integration_settings_handler2.h',
+         'browser/ui/webui/options2/font_settings_handler2.cc',
+         'browser/ui/webui/options2/font_settings_handler2.h',
+         'browser/ui/webui/options2/font_settings_utils2.h',
+Index: src/chrome/app/generated_resources.grd
+===================================================================
+--- src.orig/chrome/app/generated_resources.grd	2012-07-31 14:30:37.000000000 -0400
++++ src/chrome/app/generated_resources.grd	2012-07-31 14:34:57.794804290 -0400
+@@ -10402,6 +10402,9 @@
+       <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT">
+         Web content
+       </message>
++      <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_INTEGRATION">
++        Desktop Integration
++      </message>
+       <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY">
+         HTTPS/SSL
+       </message>
+@@ -16033,6 +16036,35 @@
+       </message>
+     </if>
+ 
++    <!-- Desktop integration -->
++    <message name="IDS_PROMPT_INTEGRATION_ENABLE_BUTTON_LABEL" desc="The text to be displayed on the checkbox that enables desktop integration.">
++      Prompt integration options for any website
++    </message>
++    <message name="IDS_DESKTOP_INTEGRATION_SETTINGS_EXCEPTIONS_BUTTON_LABEL" desc="The text to be displayed on the button that drives integration exceptions.">
++      Exceptions...
++    </message>
++    <message name="IDS_DESKTOP_INTEGRATION_SETTINGS_OVERLAY_TITLE" desc="Title for the desktop integration overlay.">
++      Integration prompt exceptions
++    </message>
++    <message name="IDS_DESKTOP_INTEGRATION_SETTINGS_OVERLAY_DESCRIPTION" desc="Description for the desktop integration overlay.">
++      These websites won't prompt any integration options
++    </message>
++    <message name="IDS_DESKTOP_INTEGRATION_SETTINGS_OVERLAY_COLUMN_DESCRIPTION" desc="Description of the desktop integration overlay's integrated websites list column.">
++      Website domains
++    </message>
++    <message name="IDS_OPTIONS_SETTINGS_INTEGRATION_WEBSITE_ADD_BUTTON"
++             desc="The label for the add button for adding a integration websites">
++      Add
++    </message>
++    <message name="IDS_OPTIONS_SETTINGS_INTEGRATION_WEBSITE_ADD_TEXT"
++             desc="The description text for the add overlay for adding a integration websites">
++      Website domain name (e.g. www.html5rocks.com)
++    </message>
++    <message name="IDS_OPTIONS_SETTINGS_INTEGRATION_WEBSITE_ADD_TITLE"
++             desc="Title for add overlay for adding a integration websites">
++      Add Integrated Website
++    </message>
++
+     <!-- Manage Profile Dialog -->
+     <message name="IDS_PROFILES_MANAGE_TITLE" desc="Title of the manage profile dialog">
+       Edit user
+Index: src/chrome/browser/resources/options2/options.html
+===================================================================
+--- src.orig/chrome/browser/resources/options2/options.html	2012-07-31 14:30:37.000000000 -0400
++++ src/chrome/browser/resources/options2/options.html	2012-07-31 14:35:18.746804981 -0400
+@@ -19,6 +19,7 @@
+ <link rel="stylesheet" href="clear_browser_data_overlay.css">
+ <link rel="stylesheet" href="content_settings.css">
+ <link rel="stylesheet" href="cookies_view.css">
++<link rel="stylesheet" href="desktop_integration_overlay.css">
+ <link rel="stylesheet" href="font_settings.css">
+ <if expr="pp_ifdef('enable_register_protocol_handler')">
+   <link rel="stylesheet" href="handler_options.css">
+@@ -87,6 +88,7 @@
+   <include src="font_settings.html">
+   <include src="home_page_overlay.html">
+   <include src="import_data_overlay.html">
++  <include src="desktop_integration_overlay.html">
+   <include src="instant_confirm_overlay.html">
+   <include src="language_options.html">
+   <include src="manage_profile_overlay.html">
+@@ -117,6 +119,7 @@
+   <include src="autofill_edit_creditcard_overlay.html">
+   <include src="content_settings_exceptions_area.html">
+   <include src="cookies_view.html">
++  <include src="desktop_integration_add_website_overlay.html">
+   <include src="language_add_language_overlay.html">
+   <if expr="pp_ifdef('chromeos')">
+     <include src="chromeos/internet_detail.html">
+Index: src/chrome/browser/resources/options2/options.js
+===================================================================
+--- src.orig/chrome/browser/resources/options2/options.js	2012-07-31 14:30:37.000000000 -0400
++++ src/chrome/browser/resources/options2/options.js	2012-07-31 14:34:57.794804290 -0400
+@@ -13,6 +13,8 @@
+ var ContentSettingsExceptionsArea =
+     options.contentSettings.ContentSettingsExceptionsArea;
+ var CookiesView = options.CookiesView;
++var DesktopIntegrationOverlay = options.DesktopIntegrationOverlay;
++var AddDesktopIntegrationWebsiteOverlay = options.AddDesktopIntegrationWebsiteOverlay;
+ var FontSettings = options.FontSettings;
+ var HandlerOptions = options.HandlerOptions;
+ var HomePageOverlay = options.HomePageOverlay;
+@@ -84,6 +86,13 @@
+   OptionsPage.registerOverlay(FontSettings.getInstance(),
+                               BrowserOptions.getInstance(),
+                               [$('fontSettingsCustomizeFontsButton')]);
++  if (cr.isLinux && !cr.isChromeos) {
++    OptionsPage.registerOverlay(AddDesktopIntegrationWebsiteOverlay.getInstance(),
++                                DesktopIntegrationOverlay.getInstance());
++    OptionsPage.registerOverlay(DesktopIntegrationOverlay.getInstance(),
++                                BrowserOptions.getInstance(),
++                                [$('desktop-integration-button')]);
++  }
+   if (HandlerOptions && $('manage-handlers-button')) {
+     OptionsPage.registerOverlay(HandlerOptions.getInstance(),
+                                 ContentSettings.getInstance(),
+Index: src/chrome/browser/resources/options2/desktop_integration_add_website_overlay.html
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/browser/resources/options2/desktop_integration_add_website_overlay.html	2012-07-31 14:34:57.794804290 -0400
+@@ -0,0 +1,16 @@
++<div id="add-desktop-integration-website-overlay-page" class="page" hidden>
++  <div class="close-button"></div>
++  <h1 i18n-content="add_desktop_website_title"></h1>
++
++  <div class="content-area">
++    <span i18n-content="add_desktop_website_input_label"></span>
++    <input id="website-url-field" type="url" data-type="url"
++           class="weakrtl favicon-cell hbox stretch">
++  </div>
++
++  <div class="action-area button-strip">
++    <button id="add-integration-website-overlay-cancel-button" i18n-content="cancel">
++    </button>
++    <button id="add-integration-website-overlay-ok-button" i18n-content="ok"></button>
++  </div>
++</div>
+Index: src/chrome/browser/resources/options2/desktop_integration_add_website_overlay.js
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/browser/resources/options2/desktop_integration_add_website_overlay.js	2012-07-31 14:34:57.794804290 -0400
+@@ -0,0 +1,44 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++///////////////////////////////////////////////////////////////////////////////
++// AddDesktopIntegrationWebsiteOverlay class:
++
++cr.define('options', function() {
++  /** @const */ var OptionsPage = options.OptionsPage;
++
++  /**
++   * @constructor
++   */
++  function AddDesktopIntegrationWebsiteOverlay() {
++    OptionsPage.call(this, 'addDesktopIntegrationWebsite',
++                     localStrings.getString('add_button'),
++                     'add-desktop-integration-website-overlay-page');
++  }
++
++  cr.addSingletonGetter(AddDesktopIntegrationWebsiteOverlay);
++
++  AddDesktopIntegrationWebsiteOverlay.prototype = {
++    // Inherit AddDesktopIntegrationWebsiteOverlay from OptionsPage.
++    __proto__: OptionsPage.prototype,
++
++    /**
++     * Initializes AddDesktopIntegrationWebsiteOverlay page.
++     * Calls base class implementation to starts preference initialization.
++     */
++    initializePage: function() {
++      // Call base class implementation to starts preference initialization.
++      OptionsPage.prototype.initializePage.call(this);
++
++      // Set up the cancel button.
++      $('add-integration-website-overlay-cancel-button').onclick = function(e) {
++        OptionsPage.closeOverlay();
++      };
++    },
++  };
++
++  return {
++    AddDesktopIntegrationWebsiteOverlay: AddDesktopIntegrationWebsiteOverlay
++  };
++});
+Index: src/chrome/browser/resources/options2/options_bundle.js
+===================================================================
+--- src.orig/chrome/browser/resources/options2/options_bundle.js	2012-07-31 14:30:37.000000000 -0400
++++ src/chrome/browser/resources/options2/options_bundle.js	2012-07-31 14:34:57.794804290 -0400
+@@ -72,6 +72,8 @@
+ <include src="content_settings_ui.js"></include>
+ <include src="cookies_list.js"></include>
+ <include src="cookies_view.js"></include>
++<include src="desktop_integration_add_website_overlay.js"></include>
++<include src="desktop_integration_overlay.js"></include>
+ <include src="font_settings.js"></include>
+ <if expr="pp_ifdef('enable_register_protocol_handler')">
+   <include src="handler_options.js"></include>
+Index: src/chrome/browser/resources/options2/browser_options.html
+===================================================================
+--- src.orig/chrome/browser/resources/options2/browser_options.html	2012-07-31 14:30:37.000000000 -0400
++++ src/chrome/browser/resources/options2/browser_options.html	2012-07-31 14:34:57.794804290 -0400
+@@ -37,7 +37,7 @@
+ <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
+       <button id="themes-gallery" i18n-content="themesGallery"></button>
+       <button id="themes-GTK-button"
+-          i18n-content="themesGTKButton"></button>
++              i18n-content="themesGTKButton"></button>
+       <button id="themes-reset"
+           i18n-content="themesSetClassic"></button>
+ </if>
+@@ -356,6 +356,22 @@
+ </if>
+     </div>
+   </section>
++
++<if expr="is_linux and not pp_ifdef('chromeos')">
++  <section id="desktop-integration-section">
++    <h3 i18n-content="advancedSectionTitleIntegration"></h3>
++    <div class="checkbox">
++      <label>
++        <input id="promptIntegrationForAnyWebsite" pref="desktop_integration_prompt.enabled"
++            metric="Options_PromptIntegration" type="checkbox">
++        <span i18n-content="promptIntegrationEnableIntegration"></span>
++      </label>
++    </div>
++    <button id="desktop-integration-button"
++        i18n-content="desktopIntegrationExceptionsSettingsButton"></button>
++  </section>
++</if>
++
+ <if expr="not pp_ifdef('chromeos')">
+   <section>
+     <h3 i18n-content="advancedSectionTitleNetwork"></h3>
+Index: src/chrome/browser/resources/options2/desktop_integration_overlay.html
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/browser/resources/options2/desktop_integration_overlay.html	2012-07-31 14:34:57.798804289 -0400
+@@ -0,0 +1,31 @@
++<div id="desktop-integration-area" class="page" hidden>
++
++  <div class="close-button"></div>
++  <h1 i18n-content="desktopIntegrationPage"></h1>
++  
++  <span i18n-content="desktopIntegrationInfoText"></span>
++ 
++  <div id="desktop-integration-column-headers">
++    <div id="desktop-integration-description-column" i18n-content="desktopIntegrationColumnDescription">
++    </div>
++  </div>
++
++  <div class="content-area">
++    <list id="domains-list"></list>
++
++    <div class="desktop-integration-lower-left">
++      <button id="desktop-integration-add-button"
++              i18n-content="add_button"></button>
++    </div>
++  </div>
++
++  <div class="action-area">
++    <div class="button-strip">
++      <button id="desktop-integrations-overlay-confirm"
++          i18n-content="ok">
++      </button>
++    </div>
++  </div>
++
++</div>
++
+Index: src/chrome/browser/resources/options2/desktop_integration_overlay.js
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/browser/resources/options2/desktop_integration_overlay.js	2012-07-31 14:34:57.798804289 -0400
+@@ -0,0 +1,201 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++cr.define('options', function() {
++  /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
++  /** @const */ var DeletableItemList = options.DeletableItemList;
++  /** @const */ var DeletableItem = options.DeletableItem;
++
++  /**
++   * Creates a new exceptions list item.
++   * @constructor
++   * @extends {options.DeletableItem}
++   */
++  function IntegratedWebsitesListItem(domain) {
++    var el = cr.doc.createElement('div');
++    el.__proto__ = IntegratedWebsitesListItem.prototype;
++    el.domain = domain;
++    el.decorate();
++    return el;
++  }
++
++  IntegratedWebsitesListItem.prototype = {
++    __proto__: DeletableItem.prototype,
++
++    /**
++     * Called when an element is decorated as a list item.
++     */
++    decorate: function() {
++      DeletableItem.prototype.decorate.call(this);
++
++      // The stored label.
++      var label = this.ownerDocument.createElement('div');
++      label.className = 'domain-name';
++      label.textContent = this.domain;
++      this.contentElement.appendChild(label);
++
++      this.deletable = true;
++    },
++  };
++
++  /**
++   * Creates a integrated websites list.
++   * @constructor
++   * @extends {cr.ui.List}
++   */
++  var IntegratedWebsitesList = cr.ui.define('list');
++
++  IntegratedWebsitesList.prototype = {
++    __proto__: DeletableItemList.prototype,
++
++    /**
++     * Called when an element is decorated as a list.
++     */
++    decorate: function() {
++      DeletableItemList.prototype.decorate.call(this);
++      this.reset();
++    },
++
++    /** @inheritDoc */
++    createItem: function(domain) {
++      return new IntegratedWebsitesListItem(domain);
++    },
++
++    /*
++     * Adds a website domain name to the list of allowed integrated websites.
++     * @param {string} domain domain name of the website to add.
++     */
++    addWebsite: function(domain) {
++      if (!domain || this.dataModel.indexOf(domain) >= 0) {
++        return;
++      }
++      this.dataModel.push(url);
++      this.redraw();
++      chrome.send('addIntegrationSite', [domain]);
++    },
++
++    /**
++     * Forces a revailidation of the list content. Content added while the list
++     * is hidden is not properly rendered when the list becomes visible. In
++     * addition, deleting a single item from the list results in a stale cache
++     * requiring an invalidation.
++     */
++    refresh: function() {
++      // TODO(kevers): Investigate if the root source of the problems can be
++      // fixed in cr.ui.list.
++      this.invalidate();
++      this.redraw();
++    },
++
++    /**
++     * Sets the integrated websites in the js model.
++     * @param {Object} entries A list of dictionaries of values, each dictionary
++     *     represents an exception.
++     */
++    setIntegratedWebsites: function(entries) {
++      var integratedWebsites = null;
++      try {
++        integratedWebsites = JSON.parse(entries);
++      } catch(e) {
++        console.log("Error while parsing integrated websites json: " + entries);
++        return;
++      }
++      // TODO hightlight domains differently based on permission
++      var domains = [];
++      domains = domains.concat(integratedWebsites['allowed']);
++      domains = domains.concat(integratedWebsites['dontask']);
++      this.dataModel = new ArrayDataModel(domains);
++      this.refresh();
++    },
++
++    /**
++     * Removes all integration scripts from the js model.
++     */
++    reset: function() {
++      this.dataModel = new ArrayDataModel([]);
++    },
++
++    /** @inheritDoc */
++    deleteItemAtIndex: function(index) {
++      if (index >= 0) {
++        var args = [this.dataModel.item(index)];
++        chrome.send('removeIntegrationSite', args);
++        this.dataModel.splice(index, 1);
++      }
++    },
++
++    /**
++     * The length of the list.
++     */
++    get length() {
++      return null != this.dataModel ? this.dataModel.length : 0;
++    },
++  };
++
++  var OptionsPage = options.OptionsPage;
++
++  /**
++   * DesktopIntegrationOverlay class
++   * Encapsulated handling of the 'Desktop integration' page.
++   * @class
++   */
++  function DesktopIntegrationOverlay() {
++    OptionsPage.call(this, 'desktopIntegrationOverlay',
++                     templateData.desktopIntegrationPage,
++                     'desktop-integration-area');
++  }
++
++  cr.addSingletonGetter(DesktopIntegrationOverlay);
++
++  DesktopIntegrationOverlay.prototype = {
++    __proto__: OptionsPage.prototype,
++
++    /**
++     * Initialize the page.
++     */
++    initializePage: function() {
++      OptionsPage.prototype.initializePage.call(this);
++
++      var integrationList = $('domains-list');
++      IntegratedWebsitesList.decorate(integrationList);
++      $('desktop-integrations-overlay-confirm').onclick =
++          OptionsPage.closeOverlay.bind(OptionsPage);
++
++      // Set up add button.
++      $('desktop-integration-add-button').onclick = function(e) {
++        OptionsPage.navigateToPage('addDesktopIntegrationWebsite');
++      };
++
++      // Listen to add website dialog ok button.
++      var addWebsiteOkButton = $('add-integration-website-overlay-ok-button');
++      addWebsiteOkButton.addEventListener('click',
++          this.handleAddWebsiteOkButtonClick_.bind(this));
++    },
++
++    handleAddWebsiteOkButtonClick_: function () {
++      var website = $('website-url-field').value;
++      $('domains-list').addWebsite(String(website));
++      OptionsPage.closeOverlay();
++    },
++
++    /**
++     * Called by the options page when this page has been shown.
++     */
++    didShowPage: function() {
++      chrome.send('updateIntegratedWebsitesList');
++    },
++  };
++
++  DesktopIntegrationOverlay.setIntegratedWebsites = function(entries) {
++    $('domains-list').setIntegratedWebsites(entries);
++  };
++
++  // Export
++  return {
++    IntegratedWebsitesListItem: IntegratedWebsitesListItem,
++    IntegratedWebsitesList: IntegratedWebsitesList,
++    DesktopIntegrationOverlay: DesktopIntegrationOverlay
++  };
++});
++
+Index: src/chrome/browser/resources/options2/desktop_integration_overlay.css
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/browser/resources/options2/desktop_integration_overlay.css	2012-07-31 14:34:57.798804289 -0400
+@@ -0,0 +1,71 @@
++/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
++ * Use of this source code is governed by a BSD-style license that can be
++ * found in the LICENSE file. */
++
++#desktop-integration-options {
++  min-width: 550px;
++}
++
++#desktop-integration-options list {
++  min-height: 172px;
++}
++
++.desktop-integration-list-item {
++  -webkit-box-flex: 1;
++  -webkit-padding-start: 8px;
++  overflow: hidden;
++  text-overflow: ellipsis;
++}
++
++.desktop-integration-lower-left button {
++  min-width: 70px;
++}
++
++.desktop-integration-lower-left {
++  -webkit-box-flex: 0;
++  -webkit-padding-start: 12px;
++  padding-bottom: 10px;
++}
++
++#desktop-integration-column-headers {
++  -webkit-margin-start: 17px;
++  display: -webkit-box;
++  margin-top: 17px;
++}
++
++#desktop-integration-column-headers > div {
++  font-weight: bold;
++}
++
++#desktop-integration-pattern-column {
++  -webkit-box-flex: 1;
++}
++
++#desktop-integration-behavior-column {
++  width: 145px;
++}
++
++#desktop-integration-area list {
++  margin-bottom: 10px;
++  margin-top: 4px;
++}
++
++#domains-list {
++  -webkit-box-flex: 1;
++  outline: none;
++  padding: 1px 0 0;
++  width: 100%;
++}
++
++#domains-list .domain-name {
++  -webkit-box-flex: 1;
++  overflow: hidden;
++  text-overflow: ellipsis;
++  white-space: nowrap;
++}
++
++#domains-list li {
++  -webkit-padding-start: 12px;
++  padding-bottom: 2px;
++  padding-top: 2px;
++}
+Index: src/chrome/browser/resources/options2/browser_options.js
+===================================================================
+--- src.orig/chrome/browser/resources/options2/browser_options.js	2012-07-31 14:30:37.000000000 -0400
++++ src/chrome/browser/resources/options2/browser_options.js	2012-07-31 14:34:57.798804289 -0400
+@@ -397,6 +397,23 @@
+             [String(event.target.options[event.target.selectedIndex].value)]);
+       };
+ 
++      // Desktop integration section
++      if (cr.isLinux && !cr.isChromeOS) {
++        var updateButtonState = function () {
++          $('desktop-integration-button').disabled =
++            ! $('promptIntegrationForAnyWebsite').checked;
++        };
++        $('promptIntegrationForAnyWebsite').onchange = function () {
++          updateButtonState();
++          chrome.send('setDesktopIntegrationAllowed',
++                      [$('promptIntegrationForAnyWebsite').checked]);
++        };
++        updateButtonState();
++        $('desktop-integration-button').onclick = function(event) {
++          OptionsPage.navigateToPage('desktopIntegrationOverlay');
++        };
++      }
++
+       // Languages section.
+       $('language-button').onclick = function(event) {
+         OptionsPage.navigateToPage('languages');
+@@ -1024,6 +1041,24 @@
+     },
+ 
+     /**
++     * Disable the desktop integration settings if needed.
++     * @private
++     */
++    disableDesktopIntegration_: function() {
++      $('desktop-integration-section').style.display = 'none';
++    },
++
++    /**
++     * Disable the desktop integration settings if needed.
++     * @private
++     */
++    setDesktopIntegrationIsAllowed_: function(enabled) {
++      $('promptIntegrationForAnyWebsite').checked = enabled;
++      $('desktop-integration-button').disabled =
++        ! $('promptIntegrationForAnyWebsite').checked;
++    },
++
++    /**
+      * Set the checked state of the metrics reporting checkbox.
+      * @private
+      */
+@@ -1357,6 +1392,7 @@
+   //Forward public APIs to private implementations.
+   [
+     'addBluetoothDevice',
++    'disableDesktopIntegration',
+     'getStartStopSyncButton',
+     'hideBluetoothSettings',
+     'removeCloudPrintConnectorSection',
+@@ -1370,6 +1406,7 @@
+     'setGtkThemeButtonEnabled',
+     'setHighContrastCheckboxState',
+     'setInstantFieldTrialStatus',
++    'setDesktopIntegrationIsAllowed',
+     'setMetricsReportingCheckboxState',
+     'setMetricsReportingSettingVisibility',
+     'setProfilesInfo',
+Index: src/chrome/browser/ui/webui/options2/options_ui2.cc
+===================================================================
+--- src.orig/chrome/browser/ui/webui/options2/options_ui2.cc	2012-07-31 14:30:37.000000000 -0400
++++ src/chrome/browser/ui/webui/options2/options_ui2.cc	2012-07-31 14:34:57.798804289 -0400
+@@ -90,6 +90,10 @@
+ #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h"
+ #endif
+ 
++#if defined(OS_LINUX)
++#include "chrome/browser/ui/webui/options2/desktop_integration_settings_handler2.h"
++#endif
++
+ using content::RenderViewHost;
+ 
+ namespace {
+@@ -233,6 +237,10 @@
+   AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
+   AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
+   AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
++#if defined(OS_LINUX)
++  AddOptionsPageUIHandler(localized_strings,
++                          new DesktopIntegrationSettingsHandler());
++#endif
+   AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
+   AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler());
+   AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler());
+Index: src/chrome/browser/ui/webui/options2/desktop_integration_settings_handler2.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/browser/ui/webui/options2/desktop_integration_settings_handler2.h	2012-07-31 14:34:57.798804289 -0400
+@@ -0,0 +1,76 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_DESKTOP_INTEGRATION_SETTINGS_HANDLER2_H_
++#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_DESKTOP_INTEGRATION_SETTINGS_HANDLER2_H_
++
++#include <string>
++
++#include "base/compiler_specific.h"
++#include "chrome/browser/ui/webui/options2/options_ui2.h"
++
++namespace base {
++class DictionaryValue;
++class ListValue;
++}
++
++namespace options2 {
++
++class DesktopIntegrationSettingsHandler : public OptionsPageUIHandler {
++ public:
++  DesktopIntegrationSettingsHandler();
++  virtual ~DesktopIntegrationSettingsHandler();
++
++  // OptionsPageUIHandler implementation.
++  virtual void GetLocalizedValues(
++      base::DictionaryValue* localized_strings) OVERRIDE;
++  virtual void InitializeHandler() OVERRIDE;
++  virtual void InitializePage() OVERRIDE;
++  virtual void RegisterMessages() OVERRIDE;
++
++ private:
++
++  // Loads the data associated with the currently integrated websites.
++  void LoadIntegratedWebsitesData();
++
++  // Initializes the list of website domain names that are currently
++  // either allowed or 'dontask' and send it to the overlay.
++  void LoadUnityWebappsEntryPoint();
++
++  // Removes an website from the list of integrated websites that won't prompt
++  // from integration.
++  // |args| - A string, the domain name of the website to remove.
++  void RemoveIntegrationSite(const ListValue* args);
++
++  // Adds an website from the list of integrated websites that won't prompt
++  // from integration. The website is being added to the list of 'allowed' sites.
++  // |args| - A string, the domain name of the website to add.
++  void AddIntegrationSite(const ListValue* args);
++
++  // Updates the integration allowed flag.
++  // |args| - A boolean flag indicating if integration should be allowed
++  void SetDesktopIntegrationAllowed(const ListValue* args);
++
++  // Updates the list of integrated websites.
++  void UpdateIntegratedWebsitesList(const ListValue* args);
++
++  // Predicate informing if we have been able to initialize the connection
++  // with the unity-webapps library (entry point for website integration
++  // permissions).
++  bool IsUnityWebappsInitialized() const;
++
++  // 
++  void * lib_unity_webapps_handle_;
++  void * get_all_func_handle_;
++  void * remove_from_permissions_func_handle_;
++  void * add_allowed_domain_func_handle_;
++  void * is_integration_allowed_func_handle_;
++  void * set_integration_allowed_func_handle_;
++
++  DISALLOW_COPY_AND_ASSIGN(DesktopIntegrationSettingsHandler);
++};
++
++}  // namespace options2
++
++#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_DESKTOP_INTEGRATION_SETTINGS_HANDLER2_H_
+Index: src/chrome/browser/ui/webui/options2/desktop_integration_settings_handler2.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/chrome/browser/ui/webui/options2/desktop_integration_settings_handler2.cc	2012-07-31 14:37:18.294808913 -0400
+@@ -0,0 +1,264 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "chrome/browser/ui/webui/options2/desktop_integration_settings_handler2.h"
++
++#include <glib.h>
++#include <dlfcn.h>
++#include <vector>
++
++#include "base/bind.h"
++#include "base/bind_helpers.h"
++#include "base/logging.h"
++#include "base/string16.h"
++#include "base/string_number_conversions.h"
++#include "base/utf_string_conversions.h"
++#include "base/values.h"
++#include "chrome/browser/ui/webui/web_ui_util.h"
++#include "chrome/common/guid.h"
++#include "chrome/common/url_constants.h"
++#include "content/public/browser/web_ui.h"
++#include "grit/generated_resources.h"
++#include "grit/webkit_resources.h"
++#include "ui/base/l10n/l10n_util.h"
++
++// Not a constant but preprocessor definition for easy concatenation.
++#define kLibunityWebappsEntryPointLibName "libunity_webapps.so.0"
++
++namespace options2 {
++
++// TODO: -> extract to function
++DesktopIntegrationSettingsHandler::DesktopIntegrationSettingsHandler()
++    : lib_unity_webapps_handle_(NULL),
++      get_all_func_handle_(NULL),
++      remove_from_permissions_func_handle_(NULL),
++      add_allowed_domain_func_handle_(NULL),
++      is_integration_allowed_func_handle_(NULL),
++      set_integration_allowed_func_handle_(NULL) {
++}
++
++DesktopIntegrationSettingsHandler::~DesktopIntegrationSettingsHandler() {
++  if (lib_unity_webapps_handle_) {
++    dlclose (lib_unity_webapps_handle_);
++    lib_unity_webapps_handle_ = NULL;
++
++    remove_from_permissions_func_handle_ = NULL;
++    get_all_func_handle_ = NULL;
++    add_allowed_domain_func_handle_ = NULL;
++    is_integration_allowed_func_handle_ = NULL;
++    set_integration_allowed_func_handle_ = NULL;
++  }
++}
++
++/////////////////////////////////////////////////////////////////////////////
++// OptionsPageUIHandler implementation:
++void DesktopIntegrationSettingsHandler::GetLocalizedValues(
++    DictionaryValue* localized_strings) {
++  DCHECK(localized_strings);
++
++  static OptionsStringResource resources[] = {
++    { "desktopIntegrationInfoText",
++      IDS_DESKTOP_INTEGRATION_SETTINGS_OVERLAY_DESCRIPTION },
++    { "desktopIntegrationColumnDescription",
++      IDS_DESKTOP_INTEGRATION_SETTINGS_OVERLAY_COLUMN_DESCRIPTION },
++  };
++
++  localized_strings->SetString("add_button",
++      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_INTEGRATION_WEBSITE_ADD_BUTTON));
++  localized_strings->SetString("add_desktop_website_input_label",
++      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_INTEGRATION_WEBSITE_ADD_TEXT));
++  localized_strings->SetString("add_desktop_website_title",
++      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_INTEGRATION_WEBSITE_ADD_TITLE));
++
++  RegisterStrings(localized_strings, resources, arraysize(resources));
++  RegisterTitle(localized_strings, "desktopIntegrationPage",
++                IDS_DESKTOP_INTEGRATION_SETTINGS_OVERLAY_TITLE);
++}
++
++void DesktopIntegrationSettingsHandler::InitializeHandler() {
++  if (!IsUnityWebappsInitialized()) {
++    LoadUnityWebappsEntryPoint();
++  }
++}
++
++void DesktopIntegrationSettingsHandler::InitializePage() {
++  DCHECK(IsUnityWebappsInitialized());
++  LoadIntegratedWebsitesData();
++}
++
++void DesktopIntegrationSettingsHandler::RegisterMessages() {
++  web_ui()->RegisterMessageCallback(
++      "addIntegrationSite",
++      base::Bind(&DesktopIntegrationSettingsHandler::AddIntegrationSite,
++                 base::Unretained(this)));
++  web_ui()->RegisterMessageCallback(
++      "setDesktopIntegrationAllowed",
++      base::Bind(&DesktopIntegrationSettingsHandler::SetDesktopIntegrationAllowed,
++                 base::Unretained(this)));
++  web_ui()->RegisterMessageCallback(
++      "removeIntegrationSite",
++      base::Bind(&DesktopIntegrationSettingsHandler::RemoveIntegrationSite,
++                 base::Unretained(this)));
++  web_ui()->RegisterMessageCallback(
++      "updateIntegratedWebsitesList",
++      base::Bind(&DesktopIntegrationSettingsHandler::UpdateIntegratedWebsitesList,
++                 base::Unretained(this)));
++}
++
++void DesktopIntegrationSettingsHandler::LoadUnityWebappsEntryPoint() {
++  DCHECK(!IsUnityWebappsInitialized());
++
++  // TODO run on FILE thread
++  static const char* const search_paths[] = {
++    kLibunityWebappsEntryPointLibName,
++    "/usr/local/lib/" kLibunityWebappsEntryPointLibName
++    , "/usr/lib/" kLibunityWebappsEntryPointLibName
++  };
++
++  void * handle = NULL;
++  for (size_t i = 0; i < sizeof(search_paths)/sizeof(search_paths[0]); ++i) {
++    DCHECK(handle == NULL);
++    // TODO validate path?
++    handle = dlopen (search_paths[i], RTLD_LAZY|RTLD_GLOBAL);
++    if (handle) {
++      LOG(INFO) << "Found libunitywebapps entry point:" << search_paths[i];
++      break;
++    }
++  }
++  if (!handle) {
++    LOG(INFO) << "Could not load Unity Webapps entry point library";
++    return;
++  }
++
++  void * get_all_handle =
++    dlsym (handle, "unity_webapps_permissions_get_all_domains");
++  void * remove_from_permissions_handle =
++    dlsym (handle, "unity_webapps_permissions_remove_domain_from_permissions");
++  void * add_allowed_domain_handle =
++    dlsym (handle, "unity_webapps_permissions_allow_domain");
++  void * is_integration_allowed_handle =
++    dlsym (handle, "unity_webapps_permissions_is_integration_allowed");
++  void * set_integration_allowed_handle =
++    dlsym (handle, "unity_webapps_permissions_set_integration_allowed");
++
++  if (!get_all_handle ||
++      !remove_from_permissions_handle ||
++      !add_allowed_domain_handle ||
++      !is_integration_allowed_handle ||
++      !set_integration_allowed_handle) {
++    LOG(WARNING) << "Could not load Unity Webapps entry point functions";
++    dlclose(handle);
++    return;
++  }
++
++  lib_unity_webapps_handle_ = handle;
++  get_all_func_handle_ = get_all_handle;
++  remove_from_permissions_func_handle_ = remove_from_permissions_handle;
++  add_allowed_domain_func_handle_ = add_allowed_domain_handle;
++  is_integration_allowed_func_handle_ = is_integration_allowed_handle;
++  set_integration_allowed_func_handle_ = set_integration_allowed_handle;
++}
++
++bool DesktopIntegrationSettingsHandler::IsUnityWebappsInitialized() const {
++  return NULL != lib_unity_webapps_handle_
++    && NULL != get_all_func_handle_
++    && NULL != remove_from_permissions_func_handle_
++    && NULL != add_allowed_domain_func_handle_
++    && NULL != is_integration_allowed_func_handle_
++    && NULL != set_integration_allowed_func_handle_;
++}
++
++void DesktopIntegrationSettingsHandler::LoadIntegratedWebsitesData() {
++  if (!IsUnityWebappsInitialized()) {
++    web_ui()->CallJavascriptFunction(
++        "BrowserOptions.disableDesktopIntegration");
++    LOG(INFO) << "Disabling Desktop Integration options";
++    return;
++  }
++
++  typedef gboolean (* IsIntegrationAllowedFunc) (void);
++  gboolean isallowed =
++    ((IsIntegrationAllowedFunc) is_integration_allowed_func_handle_) ();
++  web_ui()->CallJavascriptFunction(
++       "BrowserOptions.setDesktopIntegrationIsAllowed",
++       base::FundamentalValue(isallowed));
++}
++
++void DesktopIntegrationSettingsHandler::UpdateIntegratedWebsitesList(
++    const ListValue* args) {
++  DCHECK(IsUnityWebappsInitialized());
++
++  // TODO move elsewhere
++  typedef gchar* (* GetAllDomainsFunc) (void);
++
++  gchar* all_domains = ((GetAllDomainsFunc) get_all_func_handle_) ();
++  if (all_domains) { 
++    web_ui()->CallJavascriptFunction(
++        "DesktopIntegrationOverlay.setIntegratedWebsites",
++        StringValue(all_domains));
++  }
++}
++
++void DesktopIntegrationSettingsHandler::SetDesktopIntegrationAllowed(
++    const ListValue* args) {
++  DCHECK(IsUnityWebappsInitialized());
++
++  // TODO move elsewhere
++  typedef void (* SetDesktopIntegrationAllowedFunc) (gboolean);
++
++  bool is_allowed;
++  if (!args->GetBoolean(0, &is_allowed)) {
++    NOTREACHED();
++    return;
++  }
++
++  LOG(INFO) << "Setting desktop integration:" << is_allowed;
++
++  ((SetDesktopIntegrationAllowedFunc) set_integration_allowed_func_handle_) (
++      is_allowed ? TRUE : FALSE);
++}
++
++void DesktopIntegrationSettingsHandler::AddIntegrationSite(
++    const ListValue* args) {
++  DCHECK(IsUnityWebappsInitialized());
++
++  // TODO move elsewhere
++  typedef void (* AddDomainFromPermissionsFunc) (gchar *);
++
++  std::string domain;
++  if (!args->GetString(0, &domain)) {
++    NOTREACHED();
++    return;
++  }
++
++  LOG(INFO) << "Adding domain:" << domain << " to the list of websites allowed";
++
++  ((AddDomainFromPermissionsFunc) add_allowed_domain_func_handle_) (
++      const_cast<gchar *>(domain.c_str()));
++
++  LoadIntegratedWebsitesData ();
++}
++
++void DesktopIntegrationSettingsHandler::RemoveIntegrationSite(
++    const ListValue* args) {
++  DCHECK(IsUnityWebappsInitialized());
++
++  // TODO move elsewhere
++  typedef void (* RemoveDomainFromPermissionsFunc) (gchar *);
++
++  std::string domain;
++  if (!args->GetString(0, &domain)) {
++    NOTREACHED();
++    return;
++  }
++
++  LOG(INFO) << "Removing domain:" << domain << " from the list of websites not prompting integration";
++
++  ((RemoveDomainFromPermissionsFunc) remove_from_permissions_func_handle_) (
++      const_cast<gchar *>(domain.c_str()));
++
++  LoadIntegratedWebsitesData ();
++}
++
++}  // namespace options2
+Index: src/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+===================================================================
+--- src.orig/chrome/browser/ui/webui/options2/browser_options_handler2.cc	2012-07-31 14:30:37.000000000 -0400
++++ src/chrome/browser/ui/webui/options2/browser_options_handler2.cc	2012-07-31 14:34:57.798804289 -0400
+@@ -152,6 +152,8 @@
+     { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT },
+     { "advancedSectionTitleContent",
+       IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT },
++    { "advancedSectionTitleIntegration",
++      IDS_OPTIONS_ADVANCED_SECTION_TITLE_INTEGRATION },
+     { "advancedSectionTitleLanguages",
+       IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES },
+     { "advancedSectionTitleNetwork",
+@@ -171,6 +173,8 @@
+     { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL },
+     { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
+     { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL },
++    { "desktopIntegrationExceptionsSettingsButton",
++      IDS_DESKTOP_INTEGRATION_SETTINGS_EXCEPTIONS_BUTTON_LABEL },
+ #if defined(OS_CHROMEOS)
+     { "disableGData", IDS_OPTIONS_DISABLE_GDATA },
+ #endif
+@@ -222,6 +226,8 @@
+     { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
+     { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
+     { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
++    { "promptIntegrationEnableIntegration",
++      IDS_PROMPT_INTEGRATION_ENABLE_BUTTON_LABEL },
+     { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL },
+     { "safeBrowsingEnableProtection",
+       IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },

=== modified file 'debian/patches/dlopen_sonamed_gl.patch'
--- debian/patches/dlopen_sonamed_gl.patch	2011-10-26 06:14:33 +0000
+++ debian/patches/dlopen_sonamed_gl.patch	2012-08-06 17:52:22 +0000
@@ -9,9 +9,9 @@
 
 Index: src/ui/gfx/gl/gl_implementation_linux.cc
 ===================================================================
---- src.orig/ui/gfx/gl/gl_implementation_linux.cc	2011-10-21 17:35:43.000000000 +0100
-+++ src/ui/gfx/gl/gl_implementation_linux.cc	2011-10-21 18:40:52.767139411 +0100
-@@ -73,7 +73,7 @@
+--- src.orig/ui/gfx/gl/gl_implementation_linux.cc	2012-06-21 16:09:03.011162386 -0400
++++ src/ui/gfx/gl/gl_implementation_linux.cc	2012-06-21 16:14:21.867172877 -0400
+@@ -75,7 +75,7 @@
        }
  
        base::NativeLibrary library = LoadLibrary(
@@ -20,16 +20,3 @@
        if (!library)
          return false;
  
-@@ -120,10 +120,10 @@
-     }
- #endif  // !defined(USE_WAYLAND)
-     case kGLImplementationEGLGLES2: {
--      base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so");
-+      base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so.2");
-       if (!gles_library)
-         return false;
--      base::NativeLibrary egl_library = LoadLibrary("libEGL.so");
-+      base::NativeLibrary egl_library = LoadLibrary("libEGL.so.1");
-       if (!egl_library) {
-         base::UnloadNativeLibrary(gles_library);
-         return false;

=== modified file 'debian/patches/fix-armhf-ftbfs.patch'
--- debian/patches/fix-armhf-ftbfs.patch	2012-03-07 07:24:59 +0000
+++ debian/patches/fix-armhf-ftbfs.patch	2012-08-06 17:52:22 +0000
@@ -2,23 +2,11 @@
 Subject: Fix FTBFS on armhf
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/943281
 
-Index: src/build/common.gypi
-===================================================================
---- src.orig/build/common.gypi	2012-03-05 10:39:30.082526500 +0200
-+++ src/build/common.gypi	2012-03-05 11:02:24.082526500 +0200
-@@ -1814,7 +1814,6 @@
-                     'cflags': [
-                       '-march=armv7-a',
-                       '-mtune=cortex-a8',
--                      '-mfloat-abi=softfp',
-                     ],
-                     'conditions': [
-                       ['arm_neon==1', {
 Index: src/native_client/build/common.gypi
 ===================================================================
---- src.orig/native_client/build/common.gypi	2012-02-15 23:35:45.000000000 +0200
-+++ src/native_client/build/common.gypi	2012-03-05 11:03:09.160651492 +0200
-@@ -289,7 +289,6 @@
+--- src.orig/native_client/build/common.gypi	2012-06-21 14:40:40.000000000 -0400
++++ src/native_client/build/common.gypi	2012-06-21 16:16:02.195176177 -0400
+@@ -294,7 +294,6 @@
                  '-march=armv7-a',
                  '-mtune=cortex-a8',
                  '-mfpu=neon',
@@ -26,15 +14,3 @@
                  '-fno-exceptions',
                  '-Wall',
                  '-fPIC',
-Index: src/third_party/ffmpeg/ffmpeg.gyp
-===================================================================
---- src.orig/third_party/ffmpeg/ffmpeg.gyp	2012-02-15 23:35:36.000000000 +0200
-+++ src/third_party/ffmpeg/ffmpeg.gyp	2012-03-05 11:02:34.004401501 +0200
-@@ -170,7 +170,6 @@
-                 '-mthumb',
-                 '-march=armv7-a',
-                 '-mtune=cortex-a8',
--                '-mfloat-abi=softfp',
-               ],
-               'conditions': [
-                 ['arm_neon == 0', {

=== added file 'debian/patches/grd_parse_fix.patch'
--- debian/patches/grd_parse_fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/grd_parse_fix.patch	2012-08-06 17:52:22 +0000
@@ -0,0 +1,12 @@
+Index: src/chrome/app/chromium_strings.grd
+===================================================================
+--- src.orig/chrome/app/chromium_strings.grd	2012-07-09 14:16:01.091449368 -0400
++++ src/chrome/app/chromium_strings.grd	2012-07-09 14:25:12.951467521 -0400
+@@ -111,7 +111,6 @@
+     <if expr="not pp_ifdef('use_third_party_translations')">
+       <file path="resources/chromium_strings_am.xtb" lang="am" />
+       <file path="resources/chromium_strings_ar.xtb" lang="ar" />
+-    </if>
+       <file path="../../third_party/launchpad_translations/chromium_strings_ast.xtb" lang="ast" />
+       <file path="../../third_party/launchpad_translations/chromium_strings_bg.xtb" lang="bg" />
+       <file path="resources/chromium_strings_bn.xtb" lang="bn" />

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-30 08:42:27 +0000
+++ debian/patches/series	2012-08-06 17:52:22 +0000
@@ -1,8 +1,13 @@
 # system_v8.patch
-ubuntu_dont_overwrite_default_download_directory.patch
 chromium_useragent.patch
 disable_dlog_and_dcheck_in_release_builds.patch
 webkit_rev_parser.patch
 dlopen_sonamed_gl.patch
-glib-header-single-entry.patch
 fix-armhf-ftbfs.patch
+arm.patch
+grd_parse_fix.patch
+1-infobars.patch
+2-get-domain-tld.patch
+3-chrome-xid.patch
+chromeless-window-launch-option.patch
+desktop-integration-settings.patch

=== removed file 'debian/patches/ubuntu_dont_overwrite_default_download_directory.patch'
--- debian/patches/ubuntu_dont_overwrite_default_download_directory.patch	2011-05-06 22:59:06 +0000
+++ debian/patches/ubuntu_dont_overwrite_default_download_directory.patch	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-See http://code.google.com/p/chromium/issues/detail?id=16442
-Restore the default Downloads location used on Ubuntu.
-
----
- chrome/common/chrome_paths_linux.cc |   15 ---------------
- 1 file changed, 15 deletions(-)
-
-Index: src/chrome/common/chrome_paths_linux.cc
-===================================================================
---- src.orig/chrome/common/chrome_paths_linux.cc
-+++ src/chrome/common/chrome_paths_linux.cc
-@@ -79,35 +79,20 @@
- }
- 
- bool GetUserDocumentsDirectory(FilePath* result) {
-   scoped_ptr<base::Environment> env(base::Environment::Create());
-   *result = base::nix::GetXDGUserDirectory(env.get(), "DOCUMENTS", "Documents");
-   return true;
- }
- 
--// We respect the user's preferred download location, unless it is
--// ~ or their desktop directory, in which case we default to ~/Downloads.
- bool GetUserDownloadsDirectory(FilePath* result) {
-   scoped_ptr<base::Environment> env(base::Environment::Create());
-   *result = base::nix::GetXDGUserDirectory(env.get(), "DOWNLOAD",
-                                            kDownloadsDir);
--
--  FilePath home = file_util::GetHomeDir();
--  if (*result == home) {
--    *result = home.Append(kDownloadsDir);
--    return true;
--  }
--
--  FilePath desktop;
--  GetUserDesktop(&desktop);
--  if (*result == desktop) {
--    *result = home.Append(kDownloadsDir);
--  }
--
-   return true;
- }
- 
- bool GetUserDesktop(FilePath* result) {
-   scoped_ptr<base::Environment> env(base::Environment::Create());
-   *result = base::nix::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
-   return true;
- }

=== modified file 'debian/rules'
--- debian/rules	2012-06-18 14:17:58 +0000
+++ debian/rules	2012-08-06 17:52:22 +0000
@@ -72,9 +72,13 @@
 # Disable NaCl until we figure out what to do with the private toolchain
 GYP_DEFINES += disable_nacl=1
 
+# do not use third_party/gold as the linker.
+GYP_DEFINES += linux_use_gold_binary=0 linux_use_gold_flags=0
+
 ifneq (,$(findstring armhf,$(DEB_BUILD_ARCH)))
 GYP_DEFINES += \
 	v8_use_arm_eabi_hardfloat=true \
+	arm_float_abi=hard \
 	$(NULL)
 endif
 
@@ -143,6 +147,17 @@
 
 CC_VERSION   := $(shell gcc -dumpversion | cut -d. -f-2)
 
+# Set this to use gcc 4.6 instead of 4.7
+AVOID_GCC_47 ?= 1
+ifeq (4.7,$(CC_VERSION))
+GYP_DEFINES += werror=$(NULL)
+ifeq (1,$(AVOID_GCC_47))
+CC  := gcc-4.6
+CXX := g++-4.6
+BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX) LINK.host=$(CXX)
+endif
+endif
+
 # Set this to use gcc 4.5 instead of 4.6
 AVOID_GCC_46 ?= 0
   
@@ -235,6 +250,14 @@
 FFMPEG_MT_STD_GYP_DEFINES   = $(NULL)
 FFMPEG_MT_EXTRA_GYP_DEFINES = ffmpeg_branding=Chrome
 
+ifneq (,$(filter 12.10 unstable development,$(DEBIAN_DIST)))
+# enable compile-time dependency on gnome-keyring
+GYP_DEFINES += use_gnome_keyring=1 linux_link_gnome_keyring=1
+# controlling the use of GConf (the classic GNOME configuration
+# and GIO, which contains GSettings (the new GNOME config system)
+GYP_DEFINES += use_gconf=1 use_gio=1
+endif
+
 USE_SYSTEM_SQLITE := $(shell pkg-config 'sqlite3 >= 3.6.1' && echo 1 || echo 0)
 USE_SYSTEM_SQLITE := 0
 
@@ -549,6 +572,7 @@
 	third_party/ffmpeg/binaries \
 	third_party/fuzzymatch \
 	third_party/gles_book_examples \
+	third_party/gold \
 	third_party/hunspell/dictionaries \
 	third_party/icu/mac \
 	third_party/lcov \