ui/views/controls/menu/menu_config_aura.cc - Issue 1461923002: Change name of NativeTheme::instance() to make it clear it's web only.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/views/controls/menu/menu_config_aura.cc

Issue 1461923002: Change name of NativeTheme::instance() to make it clear it's web only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

OLD	NEW
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 "ui/base/layout.h"	7 #include "ui/base/layout.h"

8 #include "ui/base/resource/resource_bundle.h"	8 #include "ui/base/resource/resource_bundle.h"

9 #include "ui/gfx/image/image.h"	9 #include "ui/gfx/image/image.h"

10 #include "ui/gfx/image/image_skia.h"	10 #include "ui/gfx/image/image_skia.h"

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50	50

51 // In Ash, the border is provided by the shadow.	51 // In Ash, the border is provided by the shadow.

52 use_outer_border = false;	52 use_outer_border = false;

53 }	53 }

54	54

55 #if !defined(OS_WIN)	55 #if !defined(OS_WIN)

56 // static	56 // static

57 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {	57 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {

58 static MenuConfig* views_instance = NULL;	58 static MenuConfig* views_instance = NULL;

59 if (!views_instance)	59 if (!views_instance)

60 views_instance = new MenuConfig(theme ?	60 views_instance =

61 theme : ui::NativeTheme::instance());	61 new MenuConfig(theme ? theme : ui::NativeThemeAura::instance());

62 return *views_instance;	62 return *views_instance;

63 }	63 }

64 #endif	64 #endif

65	65

66 } // namespace views	66 } // namespace views

OLD	NEW

« ui/views/button_drag_utils.cc ('K') | « ui/views/controls/label.cc ('k') | ui/views/controls/menu/menu_config_mac.mm » ('j') | ui/views/controls/scrollbar/native_scroll_bar_views.cc » ('J')