diff options
Diffstat (limited to 'chrome/browser/resources')
5 files changed, 51 insertions, 21 deletions
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) { </script> <link rel="stylesheet" href="dom_ui.css"> <link rel="stylesheet" href="options/options_page.css"> +<link rel="stylesheet" href="options/browser_options_page.css"> <link rel="stylesheet" href="options/content_settings_page.css"> </head> <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> @@ -112,7 +113,6 @@ window.onpopstate = function(e) { <include src="options/chromeos_labs.html"> <!-- TODO(mazda): include options/chromeos_language_hangul_options.html once the language options dialog is ready. --> - <include src="options/sync_options.html" > </if> <include src="options/browser_options.html"> <include src="options/personal_options.html"> 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 @@ <section> <h3 i18n-content="startupGroupName"></h3> <div> - <label><input type="radio" name="startup" + <label><input type="radio" name="startup" disabled value="ShowDefaultAndNewTab"><span i18n-content="startupShowDefaultAndNewTab"></span></label><br> - <label><input type="radio" name="startup" + <label><input type="radio" name="startup" disabled value="ShowLastSession"><span i18n-content="startupShowLastSession"></span></label><br> - <label><input type="radio" name="startup" + <label><input type="radio" name="startup" disabled value="ShowPages"><span i18n-content="startupShowPages"></span></label> <div class="suboption"> <select size="3" style="width:100%"> </select><br> - <button id="startupAddButton" + <button id="startupAddButton" disabled i18n-content="startupAddButton"></button> - <button id="startupRemoveButton" + <button id="startupRemoveButton" disabled i18n-content="startupRemoveButton"></button> - <button id="startupUseCurrentButton" + <button id="startupUseCurrentButton" disabled i18n-content="startupUseCurrent"></button> </div> </div> @@ -27,14 +27,14 @@ <section> <h3 i18n-content="homepageGroupName"></h3> <div> - <label><input type="radio" name="homepage" + <label><input type="radio" name="homepage" disabled value="UseNewTab"><span i18n-content="homepageUseNewTab"></span></label><br> - <label><input type="radio" name="homepage" - value="UseNewTab"><span + <label><input type="radio" name="homepage" disabled + value="UseURL"><span i18n-content="homepageUseURL"></span></label><br> <div class="suboption"> - <input type="url"> + <input type="url" style="width:100%" disabled> </div> <div class="option"> <label><input id="homepageShowButton" @@ -46,17 +46,17 @@ <section> <h3 i18n-content="defaultSearchGroupName"></h3> <div> - <select> + <select disabled> <option value="TODO" i18n-content="TODO"></option> </select> - <button id="defaultSearchManageEnginesButton" + <button id="defaultSearchManageEnginesButton" disabled i18n-content="defaultSearchManageEnginesLink"></button> </div> </section> <section> <h3 i18n-content="defaultBrowserGroupName"></h3> <div> - <p><span i18n-content="TODO"></span></p> + <p id="defaultBrowserState" i18n-content="defaultBrowserUnknown"></p> <button id="defaultBrowserUseAsDefaultButton" i18n-content="defaultBrowserUseAsDefault"></button> </div> 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 { |