summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 20:35:23 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 20:35:23 +0000
commit78ae9edc5547acbb762886aa7d3c29d5e6c7808b (patch)
tree126fbe0d583165162dd1a7e1d30499d2788fa7dc /chrome/browser
parentd7f87037ee19af20c7a706c23872104b77d93186 (diff)
downloadchromium_src-78ae9edc5547acbb762886aa7d3c29d5e6c7808b.zip
chromium_src-78ae9edc5547acbb762886aa7d3c29d5e6c7808b.tar.gz
chromium_src-78ae9edc5547acbb762886aa7d3c29d5e6c7808b.tar.bz2
Skeleton of DOMUI implementation of Basics option page
This is just the HTML and CSS and the skeleton of some of the JavaScript. Only the checkbox for the Home button currently works. Remaining functionality will be added over time. BUG=48713 TEST=Basics page in options should show options; "Show Home button" should work. Review URL: http://codereview.chromium.org/2972001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/dom_ui/browser_options_handler.cc6
-rw-r--r--chrome/browser/resources/options/browser_options.html61
-rw-r--r--chrome/browser/resources/options/browser_options.js18
-rw-r--r--chrome/browser/resources/options/options_page.css9
4 files changed, 86 insertions, 8 deletions
diff --git a/chrome/browser/dom_ui/browser_options_handler.cc b/chrome/browser/dom_ui/browser_options_handler.cc
index cf80d6d..dfcd223 100644
--- a/chrome/browser/dom_ui/browser_options_handler.cc
+++ b/chrome/browser/dom_ui/browser_options_handler.cc
@@ -41,12 +41,6 @@ void BrowserOptionsHandler::GetLocalizedValues(
l10n_util::GetString(IDS_OPTIONS_HOMEPAGE_USE_URL));
localized_strings->SetString(L"homepageShowButton",
l10n_util::GetString(IDS_OPTIONS_HOMEPAGE_SHOW_BUTTON));
-#if defined(OS_MACOSX)
- localized_strings->SetString(L"toolbarGroupName",
- l10n_util::GetString(IDS_OPTIONS_TOOLBAR_GROUP_NAME));
- localized_strings->SetString(L"pageOptionShowButton",
- l10n_util::GetString(IDS_OPTIONS_PAGE_OPTION_SHOW_BUTTON));
-#endif
localized_strings->SetString(L"defaultSearchGroupName",
l10n_util::GetString(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME));
localized_strings->SetString(L"defaultSearchManageEnginesLink",
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 4b119a9..eee5098 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -1,3 +1,64 @@
<div class="page hidden" id="browserPage">
<h1 i18n-content="browserPage"></h1>
+ <section>
+ <h3 i18n-content="startupGroupName"></h3>
+ <div>
+ <label><input type="radio" name="startup"
+ value="ShowDefaultAndNewTab"><span
+ i18n-content="startupShowDefaultAndNewTab"></span></label><br>
+ <label><input type="radio" name="startup"
+ value="ShowLastSession"><span
+ i18n-content="startupShowLastSession"></span></label><br>
+ <label><input type="radio" name="startup"
+ value="ShowPages"><span
+ i18n-content="startupShowPages"></span></label>
+ <div class="suboption">
+ <select size="3" style="width:100%">
+ </select><br>
+ <button id="startupAddButton"
+ i18n-content="startupAddButton"></button>
+ <button id="startupRemoveButton"
+ i18n-content="startupRemoveButton"></button>
+ <button id="startupUseCurrentButton"
+ i18n-content="startupUseCurrent"></button>
+ </div>
+ </div>
+ </section>
+ <section>
+ <h3 i18n-content="homepageGroupName"></h3>
+ <div>
+ <label><input type="radio" name="homepage"
+ value="UseNewTab"><span
+ i18n-content="homepageUseNewTab"></span></label><br>
+ <label><input type="radio" name="homepage"
+ value="UseNewTab"><span
+ i18n-content="homepageUseURL"></span></label><br>
+ <div class="suboption">
+ <input type="url">
+ </div>
+ <div class="option">
+ <label><input id="homepageShowButton"
+ pref="browser.show_home_button" type="checkbox"><span
+ i18n-content="homepageShowButton"></span></label>
+ </div>
+ </div>
+ </section>
+ <section>
+ <h3 i18n-content="defaultSearchGroupName"></h3>
+ <div>
+ <select>
+ <option value="TODO" i18n-content="TODO"></option>
+ </select>
+ <button id="defaultSearchManageEnginesButton"
+ i18n-content="defaultSearchManageEnginesLink"></button>
+ </div>
+ </section>
+ <section>
+ <h3 i18n-content="defaultBrowserGroupName"></h3>
+ <div>
+ <p><span i18n-content="TODO"></span></p>
+ <button id="defaultBrowserUseAsDefaultButton"
+ i18n-content="defaultBrowserUseAsDefault"></button>
+ </div>
+ </section>
</div>
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 319dc3f..fc84913 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -23,10 +23,24 @@ BrowserOptions.prototype = {
// Initialize BrowserOptions page.
initializePage: function() {
- // Call base class implementation to starts preference initialization.
+ // Call base class implementation to start preference initialization.
OptionsPage.prototype.initializePage.call(this);
- // TODO(csilv): add any needed initialization here or delete this method.
+ $('defaultSearchManageEnginesButton').onclick = function(event) {
+ // TODO(stuartmorgan): Spawn search engine management sub-dialog.
+ };
+ $('defaultBrowserUseAsDefaultButton').onclick = function(event) {
+ // TODO(stuartmorgan): Handle making browser default.
+ };
+ $('startupAddButton').onclick = function(event) {
+ // TODO(stuartmorgan): Spawn add sub-dialog.
+ };
+ $('startupRemoveButton').onclick = function(event) {
+ // TODO(stuartmorgan): Remove selected element(s).
+ };
+ $('startupUseCurrentButton').onclick = function(event) {
+ // TODO(stuartmorgan): Add all open tabs (except this one).
+ };
},
};
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index c3fb05d..3c3ef5c 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -95,6 +95,7 @@ section {
margin-top: 10px;
border-bottom: 1px solid #ededed;
padding-bottom: 10px;
+ clear: left;
}
section > h3 {
@@ -105,6 +106,10 @@ section > h3 {
padding-left: 15px;
}
+section > div:only-of-type {
+ margin-left: 175px;
+}
+
.option {
margin-top: 5px;
}
@@ -114,6 +119,10 @@ section > h3 {
-webkit-padding-start: 10px;
}
+.suboption {
+ margin-left: 18px;
+}
+
.hidden {
display: none;
}