summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/options
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views/options')
-rw-r--r--chrome/browser/views/options/content_page_view.cc75
-rw-r--r--chrome/browser/views/options/content_page_view.h17
-rw-r--r--chrome/browser/views/options/cookies_view.cc1
3 files changed, 69 insertions, 24 deletions
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 6e3aff2..badd2f6 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -12,6 +12,7 @@
#include "app/gfx/chrome_canvas.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
+#include "base/command_line.h"
#include "base/file_util.h"
#include "base/gfx/native_theme.h"
#include "chrome/browser/browser_process.h"
@@ -19,6 +20,7 @@
#include "chrome/browser/views/options/fonts_languages_window_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 "chrome/common/pref_service.h"
#include "grit/generated_resources.h"
@@ -181,6 +183,8 @@ ContentPageView::ContentPageView(Profile* profile)
passwords_neversave_radio_(NULL),
fonts_lang_group_(NULL),
fonts_and_languages_label_(NULL),
+ themes_group_(NULL),
+ themes_reset_button_(NULL),
change_content_fonts_button_(NULL),
OptionsPageView(profile) {
}
@@ -257,6 +261,9 @@ void ContentPageView::ButtonPressed(views::Button* sender) {
GetRootWindow(),
gfx::Rect(),
new FontsLanguagesWindowView(profile()))->Show();
+ } else if (sender == themes_reset_button_) {
+ UserMetricsRecordAction(L"Options_ThemesReset", profile()->GetPrefs());
+ profile()->ClearTheme();
}
}
@@ -299,6 +306,14 @@ void ContentPageView::InitControlLayout() {
layout->AddView(form_autofill_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);
+ }
+
// Init member prefs so we can update the controls if prefs change.
default_download_location_.Init(prefs::kDownloadDefaultDirectory,
profile()->GetPrefs(), this);
@@ -445,6 +460,39 @@ void ContentPageView::InitPasswordSavingGroup() {
true);
}
+void ContentPageView::InitFontsLangGroup() {
+ fonts_and_languages_label_ = new views::Label(
+ l10n_util::GetString(IDS_OPTIONS_FONTSETTINGS_INFO));
+ fonts_and_languages_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+ fonts_and_languages_label_->SetMultiLine(true);
+ change_content_fonts_button_ = new views::NativeButton(
+ this,
+ l10n_util::GetString(IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTS_BUTTON));
+
+ using views::GridLayout;
+ using views::ColumnSet;
+
+ views::View* contents = new views::View;
+ GridLayout* layout = new GridLayout(contents);
+ contents->SetLayoutManager(layout);
+
+ const int single_column_view_set_id = 1;
+ ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
+ column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
+ GridLayout::USE_PREF, 0, 0);
+
+ layout->StartRow(0, single_column_view_set_id);
+ layout->AddView(fonts_and_languages_label_);
+ layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+ layout->StartRow(0, single_column_view_set_id);
+ layout->AddView(change_content_fonts_button_);
+
+ fonts_lang_group_ = new OptionsGroupView(
+ contents,
+ l10n_util::GetString(IDS_OPTIONS_FONTSANDLANGUAGES_GROUP_NAME),
+ L"", true);
+}
+
void ContentPageView::InitFormAutofillGroup() {
form_autofill_checkbox_ = new views::Checkbox(
l10n_util::GetString(IDS_AUTOFILL_SAVEFORMS));
@@ -468,17 +516,12 @@ void ContentPageView::InitFormAutofillGroup() {
form_autofill_group_ = new OptionsGroupView(
contents, l10n_util::GetString(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME),
- L"", false);
+ L"", true);
}
-void ContentPageView::InitFontsLangGroup() {
- fonts_and_languages_label_ = new views::Label(
- l10n_util::GetString(IDS_OPTIONS_FONTSETTINGS_INFO));
- fonts_and_languages_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
- fonts_and_languages_label_->SetMultiLine(true);
- change_content_fonts_button_ = new views::NativeButton(
- this,
- l10n_util::GetString(IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTS_BUTTON));
+void ContentPageView::InitThemesGroup() {
+ themes_reset_button_ = new views::NativeButton(this,
+ l10n_util::GetString(IDS_THEMES_RESET_BUTTON));
using views::GridLayout;
using views::ColumnSet;
@@ -490,18 +533,14 @@ void ContentPageView::InitFontsLangGroup() {
const int single_column_view_set_id = 1;
ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
- GridLayout::USE_PREF, 0, 0);
+ GridLayout::USE_PREF, 0, 0);
layout->StartRow(0, single_column_view_set_id);
- layout->AddView(fonts_and_languages_label_);
- layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
- layout->StartRow(0, single_column_view_set_id);
- layout->AddView(change_content_fonts_button_);
+ layout->AddView(themes_reset_button_);
- fonts_lang_group_ = new OptionsGroupView(
- contents,
- l10n_util::GetString(IDS_OPTIONS_FONTSANDLANGUAGES_GROUP_NAME),
- L"", true);
+ themes_group_ = new OptionsGroupView(
+ contents, l10n_util::GetString(IDS_THEMES_GROUP_NAME),
+ L"", false);
}
void ContentPageView::UpdateDownloadDirectoryDisplay() {
diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h
index 7d96e00..ff133e3 100644
--- a/chrome/browser/views/options/content_page_view.h
+++ b/chrome/browser/views/options/content_page_view.h
@@ -51,8 +51,9 @@ class ContentPageView : public OptionsPageView,
// Init all the dialog controls.
void InitDownloadLocation();
void InitPasswordSavingGroup();
- void InitFormAutofillGroup();
void InitFontsLangGroup();
+ void InitFormAutofillGroup();
+ void InitThemesGroup();
// Updates the directory displayed in the default download location view with
// the current value of the pref.
@@ -71,20 +72,24 @@ class ContentPageView : public OptionsPageView,
views::RadioButton* passwords_asktosave_radio_;
views::RadioButton* passwords_neversave_radio_;
+ // Controls for the Fonts and Languages group.
+ OptionsGroupView* fonts_lang_group_;
+ views::Label* fonts_and_languages_label_;
+ views::NativeButton* change_content_fonts_button_;
+
// Controls for the Form Autofill group
OptionsGroupView* form_autofill_group_;
views::Checkbox* form_autofill_checkbox_;
+ // Controls for the Themes group
+ OptionsGroupView* themes_group_;
+ views::NativeButton* themes_reset_button_;
+
// Controls for the Popup Blocking group.
OptionsGroupView* popups_group_;
views::RadioButton* popups_show_minimized_radio_;
views::RadioButton* popups_block_all_radio_;
- // Controls for the Fonts and Languages group.
- OptionsGroupView* fonts_lang_group_;
- views::Label* fonts_and_languages_label_;
- views::NativeButton* change_content_fonts_button_;
-
StringPrefMember default_download_location_;
BooleanPrefMember ask_for_save_location_;
BooleanPrefMember ask_to_save_passwords_;
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index 593487b..cc8d65c 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -10,6 +10,7 @@
#include "app/gfx/color_utils.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
+#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/time_format.h"
#include "chrome/browser/profile.h"
generated by cgit v1.1 at 2025-01-28 23:15:20 +0000