summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/options
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-31 07:39:53 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-31 07:39:53 +0000
commit1faba6135b52ae3a0f85760edc5ef1516c2fd756 (patch)
tree9e2c51d9c1e0f1b17c47aaff869d03d81c40a167 /chrome/browser/views/options
parent86681b9dccc5d4ea00d5f767f0e9bf417c618cc9 (diff)
downloadchromium_src-1faba6135b52ae3a0f85760edc5ef1516c2fd756.zip
chromium_src-1faba6135b52ae3a0f85760edc5ef1516c2fd756.tar.gz
chromium_src-1faba6135b52ae3a0f85760edc5ef1516c2fd756.tar.bz2
Now that themes are enabled by default, the option should be visible by default.
BUG=none TEST=Verify that you can see the option to reset your theme in the second tab of the options dialog. Review URL: http://codereview.chromium.org/112079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options')
-rw-r--r--chrome/browser/views/options/content_page_view.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index adbd1d7..3e4f2c3 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -12,14 +12,12 @@
#include "app/gfx/canvas.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
-#include "base/command_line.h"
#include "base/gfx/native_theme.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/views/clear_browsing_data.h"
#include "chrome/browser/views/importer_view.h"
#include "chrome/browser/views/options/options_group_view.h"
#include "chrome/browser/views/options/passwords_exceptions_window_view.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "grit/generated_resources.h"
#include "views/controls/button/radio_button.h"
@@ -131,13 +129,10 @@ void ContentPageView::InitControlLayout() {
layout->AddView(clear_data_group_);
layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
- if (CommandLine::ForCurrentProcess()->
- HasSwitch(switches::kEnableExtensions)) {
- layout->StartRow(0, single_column_view_set_id);
- InitThemesGroup();
- layout->AddView(themes_group_);
- layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
- }
+ layout->StartRow(0, single_column_view_set_id);
+ InitThemesGroup();
+ layout->AddView(themes_group_);
+ layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
// Init member prefs so we can update the controls if prefs change.
ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled,