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

Side by Side 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: Fix missing initializer 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/menu/menu_config.h" 5 #include "ui/views/controls/menu/menu_config.h"
6 6
7 #include "grit/ui_resources.h"
8 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/gfx/image/image_skia.h"
10 #include "ui/native_theme/native_theme_mac.h"
11 #include "ui/views/controls/menu/menu_image_util.h"
12
7 namespace views { 13 namespace views {
8 14
9 void MenuConfig::Init(const ui::NativeTheme* theme) { 15 void MenuConfig::Init(const ui::NativeTheme* theme) {
10 NOTIMPLEMENTED(); 16 NOTIMPLEMENTED();
11 } 17 }
12 18
19 // static
20 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {
21 CR_DEFINE_STATIC_LOCAL(MenuConfig,
22 mac_instance,
23 (theme ? theme : ui::NativeTheme::instance()));
24 return mac_instance;
25 }
26
13 } // namespace views 27 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698