summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 21:57:18 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 21:57:18 +0000
commit1a522567a7cf1eb82939b495c26bb190f289705d (patch)
tree5f264ddec09a80f7e4e85fd2e29a533756ac65b2 /chrome
parent9cd885f4cf5525e3cbb66e4a1a7460217dea0d78 (diff)
downloadchromium_src-1a522567a7cf1eb82939b495c26bb190f289705d.zip
chromium_src-1a522567a7cf1eb82939b495c26bb190f289705d.tar.gz
chromium_src-1a522567a7cf1eb82939b495c26bb190f289705d.tar.bz2
Part 2 of making options dialog white on ChromeOS
BUG=<http://crosbug.com/1885> TEST=Verify ChromeOS options dialog background if white as in mock http://www.chromium.org/chromium-os/user-experience/settings Review URL: http://codereview.chromium.org/1725004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/options/options_window_view.cc17
1 files changed, 16 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc
index 2f7a7bd..1e6580f 100644
--- a/chrome/browser/chromeos/options/options_window_view.cc
+++ b/chrome/browser/chromeos/options/options_window_view.cc
@@ -223,37 +223,52 @@ void OptionsWindowView::Init() {
tabs_->SetListener(this);
AddChildView(tabs_);
- // Set vertical padding of tab header.
GtkWidget* notebook = static_cast<views::NativeTabbedPaneGtk*>(
tabs_->native_wrapper())->native_view();
+
+ // Set vertical padding of tab header.
gtk_notebook_set_tab_vborder(GTK_NOTEBOOK(notebook), 5);
+ // Set a name for notebook. Note that the name is also used in theme engine
+ // to apply specific drawings for this widget.
+ gtk_widget_set_name(GTK_WIDGET(notebook), "chromeos-options-tab");
+
// Setup tab pages.
int tab_index = 0;
SystemPageView* system_page = new SystemPageView(profile_);
+ system_page->set_background(views::Background::CreateSolidBackground(
+ SK_ColorWHITE));
tabs_->AddTabAtIndex(tab_index++,
l10n_util::GetString(IDS_OPTIONS_SYSTEM_TAB_LABEL),
system_page, false);
InternetPageView* internet_page = new InternetPageView(profile_);
+ internet_page->set_background(views::Background::CreateSolidBackground(
+ SK_ColorWHITE));
tabs_->AddTabAtIndex(tab_index++,
l10n_util::GetString(IDS_OPTIONS_INTERNET_TAB_LABEL),
internet_page, false);
views::NativeViewHost* general_page_view = new views::NativeViewHost();
+ general_page_view->set_background(views::Background::CreateSolidBackground(
+ SK_ColorWHITE));
tabs_->AddTabAtIndex(tab_index++,
l10n_util::GetString(IDS_OPTIONS_GENERAL_TAB_LABEL),
general_page_view, false);
general_page_view->Attach(general_page_.get_page_widget());
views::NativeViewHost* content_page_view = new views::NativeViewHost();
+ content_page_view->set_background(views::Background::CreateSolidBackground(
+ SK_ColorWHITE));
tabs_->AddTabAtIndex(tab_index++,
l10n_util::GetString(IDS_OPTIONS_CONTENT_TAB_LABEL),
content_page_view, false);
content_page_view->Attach(content_page_.get_page_widget());
views::NativeViewHost* advanced_page_view = new views::NativeViewHost();
+ advanced_page_view->set_background(views::Background::CreateSolidBackground(
+ SK_ColorWHITE));
tabs_->AddTabAtIndex(tab_index++,
l10n_util::GetString(IDS_OPTIONS_ADVANCED_TAB_LABEL),
advanced_page_view, false);