summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc37
-rw-r--r--chrome/browser/ui/content_settings/content_setting_bubble_model.cc7
-rw-r--r--chrome/browser/ui/content_settings/content_setting_bubble_model.h4
-rw-r--r--chrome/browser/ui/views/content_setting_bubble_contents.cc85
-rw-r--r--chrome/browser/ui/views/content_setting_bubble_contents.h4
5 files changed, 66 insertions, 71 deletions
diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
index 866b2e9..5f50334 100644
--- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
+++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
@@ -31,24 +31,23 @@ void BrowserContentSettingBubbleModelDelegate::ShowCollectedCookiesDialog(
void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage(
ContentSettingsType type) {
- if (type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) {
- // We don't (yet?) implement user-settable exceptions for mixed script
- // blocking, so bounce to an explanatory page for now.
- GURL url(google_util::AppendGoogleLocaleParam(
- GURL(kInsecureScriptHelpUrl)));
- chrome::AddSelectedTabWithURL(browser_, url, content::PAGE_TRANSITION_LINK);
- return;
+ switch (type) {
+ case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
+ // We don't (yet?) implement user-settable exceptions for mixed script
+ // blocking, so bounce to an explanatory page for now.
+ chrome::AddSelectedTabWithURL(
+ browser_,
+ google_util::AppendGoogleLocaleParam(GURL(kInsecureScriptHelpUrl)),
+ content::PAGE_TRANSITION_LINK);
+ return;
+ case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
+ chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);
+ return;
+ case CONTENT_SETTINGS_TYPE_SAVE_PASSWORD:
+ chrome::ShowSettingsSubPage(browser_, chrome::kPasswordManagerSubPage);
+ return;
+ default:
+ chrome::ShowContentSettings(browser_, type);
+ return;
}
-
- if (type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
- chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);
- return;
- }
-
- if (type == CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
- chrome::ShowSettingsSubPage(browser_, chrome::kPasswordManagerSubPage);
- return;
- }
-
- chrome::ShowContentSettings(browser_, type);
}
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index e97cbfd..6d446cc 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -588,6 +588,8 @@ SavePasswordBubbleModel::SavePasswordBubbleModel(Delegate* delegate,
SetTitle();
}
+SavePasswordBubbleModel::~SavePasswordBubbleModel() {}
+
void SavePasswordBubbleModel::SetTitle() {
int title_id = 0;
// If the save password icon was accessed, the icon is displayed and the
@@ -601,13 +603,13 @@ void SavePasswordBubbleModel::SetTitle() {
void SavePasswordBubbleModel::OnCancelClicked() {
TabSpecificContentSettings* content_settings =
TabSpecificContentSettings::FromWebContents(web_contents());
- content_settings->PasswordFormBlacklisted();
+ content_settings->set_password_action(PasswordFormManager::BLACKLIST);
}
void SavePasswordBubbleModel::OnSaveClicked() {
TabSpecificContentSettings* content_settings =
TabSpecificContentSettings::FromWebContents(web_contents());
- content_settings->PasswordAccepted();
+ content_settings->set_password_action(PasswordFormManager::SAVE);
}
// The model of the content settings bubble for media settings.
@@ -621,7 +623,6 @@ class ContentSettingMediaStreamBubbleModel
virtual ~ContentSettingMediaStreamBubbleModel();
private:
- // Sets the title of the bubble.
void SetTitle();
// Sets the data for the radio buttons of the bubble.
void SetRadioGroup();
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
index 73f3500..1f4f994 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
@@ -196,11 +196,11 @@ class SavePasswordBubbleModel : public ContentSettingTitleAndLinkModel {
SavePasswordBubbleModel(Delegate* delegate,
content::WebContents* web_contents,
Profile* profile);
- virtual ~SavePasswordBubbleModel() {}
+ virtual ~SavePasswordBubbleModel();
virtual void OnCancelClicked() OVERRIDE;
virtual void OnSaveClicked() OVERRIDE;
+
private:
- // Sets the title of the bubble.
void SetTitle();
TabSpecificContentSettings::PasswordSavingState state_;
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index b600e35..3d6639a 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -146,11 +146,11 @@ ContentSettingBubbleContents::ContentSettingBubbleContents(
: BubbleDelegateView(anchor_view, arrow),
content_setting_bubble_model_(content_setting_bubble_model),
web_contents_(web_contents),
+ cancel_button_(NULL),
+ save_button_(NULL),
custom_link_(NULL),
manage_link_(NULL),
- close_button_(NULL),
- never_button_(NULL),
- save_button_(NULL) {
+ close_button_(NULL) {
// Compensate for built-in vertical padding in the anchor view's image.
set_anchor_view_insets(gfx::Insets(5, 0, 5, 0));
@@ -383,19 +383,11 @@ void ContentSettingBubbleContents::Init() {
bubble_content_empty = false;
}
- if (!bubble_content_empty) {
- layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
- layout->StartRow(0, kSingleColumnSetId);
- layout->AddView(new views::Separator(views::Separator::HORIZONTAL), 1, 1,
- GridLayout::FILL, GridLayout::FILL);
- layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
- }
-
+ const int kDoubleColumnSetId = 1;
+ views::ColumnSet* double_column_set =
+ layout->AddColumnSet(kDoubleColumnSetId);
if (content_setting_bubble_model_->content_type() ==
CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
- const int kDoubleColumnSetId = 2;
- views::ColumnSet* double_column_set =
- layout->AddColumnSet(kDoubleColumnSetId);
double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 1,
GridLayout::USE_PREF, 0, 0);
double_column_set->AddPaddingColumn(
@@ -403,39 +395,50 @@ void ContentSettingBubbleContents::Init() {
double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
GridLayout::USE_PREF, 0, 0);
- const int kSingleColumnRightSetId = 1;
+ const int kSingleColumnRightSetId = 2;
views::ColumnSet* right_column_set =
layout->AddColumnSet(kSingleColumnRightSetId);
right_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
GridLayout::USE_PREF, 0, 0);
- never_button_ = new views::LabelButton(
+ cancel_button_ = new views::LabelButton(
this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON));
- never_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+ cancel_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
save_button_ = new views::LabelButton(
this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SAVE_BUTTON));
save_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
manage_link_->set_listener(this);
- // Buttons row
+ layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+
layout->StartRow(0, kDoubleColumnSetId);
- layout->AddView(never_button_);
+ layout->AddView(cancel_button_);
layout->AddView(save_button_);
- // Manage link row
+ layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+ layout->StartRow(0, kSingleColumnSetId);
+ layout->AddView(new views::Separator(views::Separator::HORIZONTAL), 1, 1,
+ GridLayout::FILL, GridLayout::FILL);
+ layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+
layout->StartRow(0, kSingleColumnRightSetId);
layout->AddView(manage_link_);
} else {
- const int kDoubleColumnSetId = 1;
- views::ColumnSet* double_column_set =
- layout->AddColumnSet(kDoubleColumnSetId);
+ if (!bubble_content_empty) {
+ layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+ layout->StartRow(0, kSingleColumnSetId);
+ layout->AddView(new views::Separator(views::Separator::HORIZONTAL), 1, 1,
+ GridLayout::FILL, GridLayout::FILL);
+ layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+ }
+
double_column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
- GridLayout::USE_PREF, 0, 0);
+ GridLayout::USE_PREF, 0, 0);
double_column_set->AddPaddingColumn(
0, views::kUnrelatedControlHorizontalSpacing);
double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
- GridLayout::USE_PREF, 0, 0);
+ GridLayout::USE_PREF, 0, 0);
layout->StartRow(0, kDoubleColumnSetId);
manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
@@ -451,30 +454,22 @@ void ContentSettingBubbleContents::Init() {
void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
const ui::Event& event) {
- if (sender == save_button_) {
- content_setting_bubble_model_->OnSaveClicked();
- StartFade(false);
+ RadioGroup::const_iterator i(
+ std::find(radio_group_.begin(), radio_group_.end(), sender));
+ if (i != radio_group_.end()) {
+ content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
return;
}
- if (sender == never_button_) {
+
+ if (sender == save_button_)
+ content_setting_bubble_model_->OnSaveClicked();
+ else if (sender == cancel_button_)
content_setting_bubble_model_->OnCancelClicked();
- StartFade(false);
- return;
- }
- if (sender == close_button_) {
+ else if (sender == close_button_)
content_setting_bubble_model_->OnDoneClicked();
- StartFade(false);
- return;
- }
-
- for (RadioGroup::const_iterator i(radio_group_.begin());
- i != radio_group_.end(); ++i) {
- if (sender == *i) {
- content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
- return;
- }
- }
- NOTREACHED() << "unknown radio";
+ else
+ NOTREACHED();
+ StartFade(false);
}
void ContentSettingBubbleContents::LinkClicked(views::Link* source,
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.h b/chrome/browser/ui/views/content_setting_bubble_contents.h
index f80114a..de7b0e9 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.h
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.h
@@ -110,11 +110,11 @@ class ContentSettingBubbleContents : public content::NotificationObserver,
PopupLinks popup_links_;
typedef std::vector<views::RadioButton*> RadioGroup;
RadioGroup radio_group_;
+ views::LabelButton* cancel_button_;
+ views::LabelButton* save_button_;
views::Link* custom_link_;
views::Link* manage_link_;
views::LabelButton* close_button_;
- views::LabelButton* never_button_;
- views::LabelButton* save_button_;
scoped_ptr<views::MenuRunner> menu_runner_;
MediaMenuPartsMap media_menus_;
generated by cgit v1.1 at 2025-04-03 03:19:40 +0000