From b2f468392b6334bf2ca11536b1b4c7a12cf8c864 Mon Sep 17 00:00:00 2001 From: "stuartmorgan@chromium.org" Date: Wed, 14 Jul 2010 15:58:59 +0000 Subject: Implement default browser pref in DOMUI Also disables all the not-yet-implemented controls so it's clear what works and what doesn't. BUG=48713 TEST=Running with --enable-tabbed-options, default browser display and button should work in prefs. Review URL: http://codereview.chromium.org/2927012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52318 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/resources/options.html | 2 +- .../browser/resources/options/browser_options.html | 26 ++++++++-------- .../browser/resources/options/browser_options.js | 35 ++++++++++++++++++---- .../resources/options/browser_options_page.css | 7 +++++ chrome/browser/resources/options/options_page.css | 2 +- 5 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 chrome/browser/resources/options/browser_options_page.css (limited to 'chrome/browser/resources') diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html index bb67fb0..0fd0962 100644 --- a/chrome/browser/resources/options.html +++ b/chrome/browser/resources/options.html @@ -82,6 +82,7 @@ window.onpopstate = function(e) { + @@ -112,7 +113,6 @@ window.onpopstate = function(e) { - diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html index eee5098..6fce008 100644 --- a/chrome/browser/resources/options/browser_options.html +++ b/chrome/browser/resources/options/browser_options.html @@ -3,23 +3,23 @@

-
-
-

- - -
@@ -27,14 +27,14 @@

-
-
- +

-

+

diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js index fc84913..42e3265 100644 --- a/chrome/browser/resources/options/browser_options.js +++ b/chrome/browser/resources/options/browser_options.js @@ -26,12 +26,10 @@ BrowserOptions.prototype = { // Call base class implementation to start preference initialization. OptionsPage.prototype.initializePage.call(this); - $('defaultSearchManageEnginesButton').onclick = function(event) { - // TODO(stuartmorgan): Spawn search engine management sub-dialog. - }; - $('defaultBrowserUseAsDefaultButton').onclick = function(event) { - // TODO(stuartmorgan): Handle making browser default. - }; + // Fetch initial state of the default browser pref section. + chrome.send('updateDefaultBrowserState'); + + // Wire up buttons. $('startupAddButton').onclick = function(event) { // TODO(stuartmorgan): Spawn add sub-dialog. }; @@ -41,6 +39,31 @@ BrowserOptions.prototype = { $('startupUseCurrentButton').onclick = function(event) { // TODO(stuartmorgan): Add all open tabs (except this one). }; + $('defaultSearchManageEnginesButton').onclick = function(event) { + // TODO(stuartmorgan): Spawn search engine management sub-dialog. + }; + $('defaultBrowserUseAsDefaultButton').onclick = function(event) { + chrome.send('becomeDefaultBrowser'); + }; + }, + + // Update the Default Browsers section based on the current state. + updateDefaultBrowserState_: function(statusString, isDefault) { + var label = $('defaultBrowserState'); + label.textContent = statusString; + if (isDefault) { + label.classList.add('current'); + } else { + label.classList.remove('current'); + } + + $('defaultBrowserUseAsDefaultButton').disabled = isDefault; }, }; +BrowserOptions.updateDefaultBrowserStateCallback = function(statusString, + isDefault) { + BrowserOptions.getInstance().updateDefaultBrowserState_(statusString, + isDefault); +} + diff --git a/chrome/browser/resources/options/browser_options_page.css b/chrome/browser/resources/options/browser_options_page.css new file mode 100644 index 0000000..17dfc63 --- /dev/null +++ b/chrome/browser/resources/options/browser_options_page.css @@ -0,0 +1,7 @@ +#defaultBrowserState { + color: #880000; +} + +#defaultBrowserState.current { + color: #008800; +} diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css index d2cf9c1..b515d01 100644 --- a/chrome/browser/resources/options/options_page.css +++ b/chrome/browser/resources/options/options_page.css @@ -120,7 +120,7 @@ section > div:only-of-type { } .suboption { - margin-left: 18px; + -webkit-margin-start: 18px; } .hidden { -- cgit v1.1