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

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

Issue 267593005: Refactor menu controller to isolate aura dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More fixes for sky Created 6 years, 7 months 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/display_change_listener_mac.cc ('k') | ui/views/controls/menu/menu_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_config_mac.cc
diff --git a/ui/views/controls/menu/menu_config_mac.cc b/ui/views/controls/menu/menu_config_mac.cc
index fdd7de9da297ce9db37d60baa32e35a3bc0f50a7..dd38e72fe7e2bed06fbca22a0409951f01589b70 100644
--- a/ui/views/controls/menu/menu_config_mac.cc
+++ b/ui/views/controls/menu/menu_config_mac.cc
@@ -4,10 +4,23 @@
#include "ui/views/controls/menu/menu_config.h"
+#include "grit/ui_resources.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/native_theme/native_theme_mac.h"
+#include "ui/views/controls/menu/menu_image_util.h"
+
namespace views {
void MenuConfig::Init(const ui::NativeTheme* theme) {
NOTIMPLEMENTED();
}
+// static
+const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {
+ CR_DEFINE_STATIC_LOCAL(
+ MenuConfig, mac_instance, (theme ? theme : ui::NativeTheme::instance()));
+ return mac_instance;
+}
+
} // namespace views
« no previous file with comments | « ui/views/controls/menu/display_change_listener_mac.cc ('k') | ui/views/controls/menu/menu_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698