Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: chrome/browser/ui/views/content_setting_bubble_contents.cc

Issue 1477253002: Use a single views::MenuConfig instance for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add menu_config_android Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 54e273abdfe6254e10c5d002fc88f0b15b1b022d..7cdc6b0f3bf2e2d8ae9e55d1def3b740f37b5b9d 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -337,7 +337,7 @@ void ContentSettingBubbleContents::Init() {
}
}
- UpdateMenuButtonSizes(GetNativeTheme());
+ UpdateMenuButtonSizes();
const gfx::FontList& domain_font =
ui::ResourceBundle::GetSharedInstance().GetFontList(
@@ -409,12 +409,6 @@ void ContentSettingBubbleContents::DidNavigateMainFrame(
GetWidget()->Close();
}
-void ContentSettingBubbleContents::OnNativeThemeChanged(
- const ui::NativeTheme* theme) {
- views::BubbleDelegateView::OnNativeThemeChanged(theme);
- UpdateMenuButtonSizes(theme);
-}
-
void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
const ui::Event& event) {
RadioGroup::const_iterator i(
@@ -472,9 +466,8 @@ void ContentSettingBubbleContents::OnMenuButtonClicked(
ui::MENU_SOURCE_NONE));
}
-void ContentSettingBubbleContents::UpdateMenuButtonSizes(
- const ui::NativeTheme* theme) {
- const views::MenuConfig config = views::MenuConfig(theme);
+void ContentSettingBubbleContents::UpdateMenuButtonSizes() {
+ const views::MenuConfig& config = views::MenuConfig::instance();
const int margins = config.item_left_margin + config.check_width +
config.label_to_arrow_padding + config.arrow_width +
config.arrow_to_edge_padding;
« no previous file with comments | « chrome/browser/ui/views/content_setting_bubble_contents.h ('k') | chrome/browser/ui/views/toolbar/app_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698