diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 01:28:33 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 01:28:33 +0000 |
| commit | 92c445f695bba2ab64f2b68c9ccc168c48bb4aa0 (patch) | |
| tree | b8943481e6e33b871d1813f3d911d555144dc547 /chrome/browser | |
| parent | a53fc2ec1ece94f7bae82862c5d60ae9c197d97a (diff) | |
| download | chromium_src-92c445f695bba2ab64f2b68c9ccc168c48bb4aa0.zip chromium_src-92c445f695bba2ab64f2b68c9ccc168c48bb4aa0.tar.gz chromium_src-92c445f695bba2ab64f2b68c9ccc168c48bb4aa0.tar.bz2 | |
Removed incompatible options from ChromeOS version of DOM UI options page.
BUG=chromium-os:5668
TEST=make sure that 'import browser settings' and 'make chrome the default browser' don't show up on ChromeOS in the options (DOM UI)
Review URL: http://codereview.chromium.org/3125008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
4 files changed, 14 insertions, 7 deletions
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html index 866593f..7c3eb14 100644 --- a/chrome/browser/resources/options/browser_options.html +++ b/chrome/browser/resources/options/browser_options.html @@ -53,6 +53,7 @@ i18n-content="defaultSearchManageEnginesLink"></button> </div> </section> +<if expr="not pp_ifdef('chromeos')"> <section> <h3 i18n-content="defaultBrowserGroupName"></h3> <div> @@ -62,4 +63,5 @@ i18n-content="defaultBrowserUseAsDefault"></button> </div> </section> +</if> </div> diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js index 079b672..6c58bf6 100644 --- a/chrome/browser/resources/options/browser_options.js +++ b/chrome/browser/resources/options/browser_options.js @@ -44,9 +44,11 @@ cr.define('options', function() { $('defaultSearchManageEnginesButton').onclick = function(event) { OptionsPage.showPageByName('searchEngines'); }; - $('defaultBrowserUseAsDefaultButton').onclick = function(event) { - chrome.send('becomeDefaultBrowser'); - }; + if (!cr.isChromeOS) { + $('defaultBrowserUseAsDefaultButton').onclick = function(event) { + chrome.send('becomeDefaultBrowser'); + }; + } // Initialize control enabled states. Preferences.getInstance().addEventListener('session.restore_on_startup', diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html index 4065852..f00bacf 100644 --- a/chrome/browser/resources/options/personal_options.html +++ b/chrome/browser/resources/options/personal_options.html @@ -47,13 +47,14 @@ <button id="autofill_options" i18n-content="autofill_options"></button> </div> </section> +<if expr="not pp_ifdef('chromeos')"> <section> <h3 i18n-content="browsing_data"></h3> <div> <button id="import_data" i18n-content="import_data"></button> </div> </section> - +</if> <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)"> <section> <h3 i18n-content="appearance"></h3> diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js index 83c4435..58e2b9b 100644 --- a/chrome/browser/resources/options/personal_options.js +++ b/chrome/browser/resources/options/personal_options.js @@ -66,9 +66,11 @@ cr.define('options', function() { OptionsPage.showPageByName('autoFillOptions'); }; - $('import_data').onclick = function(event) { - OptionsPage.showOverlay('importDataOverlay'); - }; + if (!cr.isChromeOS) { + $('import_data').onclick = function(event) { + OptionsPage.showOverlay('importDataOverlay'); + }; + } if(!cr.isChromeOS && navigator.platform.match(/linux|BSD/i)) { $('themes_GTK_button').onclick = function(event) { |