[meego-commits] 15032: Changes to devel:browser/chromium

[Hao H. Li]

Hi,
I have made the following changes to chromium in project devel:browser. Please review and accept ASAP.

Thank You,
Hao H. Li

[This message was auto-generated]

---

Request #15032:

  submit:   home:haoli:branches:devel:browser/chromium(r11)(cleanup) -> devel:browser/chromium


Message:
    Add Import_Cancel_14505.patch to fix bmc #14505

State:   new          2011-03-20T19:55:21 haoli
Comment: None



changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -0,0 +1,3 @@
+* Wed Mar 16 2011 Hao Li <hao.h.li at intel.com> - 11.0.678.0
+- Add Import_Cancel_14505.patch to fix bmc #14505
+

new:
----
  Import_Cancel_14505.patch

spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -49,6 +49,8 @@
 Patch6:		chromium-20100319-default-browser-setting.patch
 # Fix droid sans font rendering issue
 Patch7:		webkit-complex-font-selection-fix.patch
+# Fix MeeGo 14505
+Patch8:		Import_Cancel_14505.patch
 
 Source0:	chromium-%{version}.tar.bz2
 Source1:	http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
@@ -152,6 +154,7 @@
 %patch5 -p1 -b .chromium-system-ffmpeg
 %patch6 -p1 -b .chromium-20100319-default-browser-setting
 %patch7 -p1 -b .webkit-complex-font-selection-fix
+%patch8 -p1 -b .Import_Cancel_14505
 
 pushd third_party/ffmpeg/
 tar xf %{SOURCE5}

other changes:
--------------

++++++ Import_Cancel_14505.patch (new)
--- Import_Cancel_14505.patch
+++ Import_Cancel_14505.patch
+diff --git a/chrome/browser/resources/options/import_data_overlay.js b/chrome/browser/resources/options/import_data_overlay.js
+index 9496f8a..e163f3f 100644
+--- a/chrome/browser/resources/options/import_data_overlay.js
++++ b/chrome/browser/resources/options/import_data_overlay.js
+@@ -101,11 +101,13 @@ cr.define('options', function() {
+      */
+     updateCheckboxes_: function() {
+       var index = $('import-browsers').selectedIndex;
+-      var browserProfile = ImportDataOverlay.browserProfiles[index];
++      var browserProfile;
++      if (this.browserProfiles.length > index)
++ 	browserProfile = this.browserProfiles[index];
+       var importOptions = ['history', 'favorites', 'passwords', 'search'];
+       for (var i = 0; i < importOptions.length; i++) {
+         var checkbox = $('import-' + importOptions[i]);
+-        this.setUpCheckboxState_(checkbox, browserProfile[importOptions[i]]);
++        this.setUpCheckboxState_(checkbox, browserProfile ? browserProfile[importOptions[i]] : false);
+       }
+     },
+ 
+@@ -115,7 +117,7 @@ cr.define('options', function() {
+      * @private
+      */
+     updateSupportedBrowsers_: function(browsers) {
+-      ImportDataOverlay.browserProfiles = browsers;
++      this.browserProfiles = browsers;
+       var browserSelect = $('import-browsers');
+       browserSelect.remove(0);  // Remove the 'Loading...' option.
+       browserSelect.textContent = '';