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

Unified Diff: ui/views/controls/menu/menu_config.cc

Issue 1514693006: Revert of Use a single views::MenuConfig instance for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase revert on https://codereview.chromium.org/1504743003 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
« no previous file with comments | « ui/views/controls/menu/menu_config.h ('k') | ui/views/controls/menu/menu_config_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_config.cc
diff --git a/ui/views/controls/menu/menu_config.cc b/ui/views/controls/menu/menu_config.cc
index 52c39e4d49c2cee5c0a9ea370dd874e3dbc24e6a..0d726c54002850a39de29abc159f74116f0b5bae 100644
--- a/ui/views/controls/menu/menu_config.cc
+++ b/ui/views/controls/menu/menu_config.cc
@@ -4,11 +4,11 @@
#include "ui/views/controls/menu/menu_config.h"
-#include "base/macros.h"
+#include "build/build_config.h"
namespace views {
-MenuConfig::MenuConfig()
+MenuConfig::MenuConfig(const ui::NativeTheme* theme)
: arrow_color(SK_ColorBLACK),
menu_vertical_border_size(3),
menu_horizontal_border_size(0),
@@ -42,15 +42,9 @@ MenuConfig::MenuConfig()
check_selected_combobox_item(false),
show_delay(400),
corner_radius(0) {
- Init();
+ Init(theme);
}
MenuConfig::~MenuConfig() {}
-// static
-const MenuConfig& MenuConfig::instance() {
- CR_DEFINE_STATIC_LOCAL(MenuConfig, instance, ());
- return instance;
-}
-
} // namespace views
« no previous file with comments | « ui/views/controls/menu/menu_config.h ('k') | ui/views/controls/menu/menu_config_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698