ui/views/controls/menu/menu_config_aura.cc - Issue 480693002: Use a qualified path for ui_resources.h grit includes.

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 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 years, 4 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

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 "grit/ui_resources.h"

8 #include "ui/base/layout.h"	7 #include "ui/base/layout.h"

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

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

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

12 #include "ui/native_theme/native_theme_aura.h"	11 #include "ui/native_theme/native_theme_aura.h"

	12 #include "ui/resources/grit/ui_resources.h"

13 #include "ui/views/controls/menu/menu_image_util.h"	13 #include "ui/views/controls/menu/menu_image_util.h"

14	14

15 namespace views {	15 namespace views {

16	16

17 namespace {	17 namespace {

18 #if defined(OS_CHROMEOS)	18 #if defined(OS_CHROMEOS)

19 static const int kMenuCornerRadiusForAura = 2;	19 static const int kMenuCornerRadiusForAura = 2;

20 #else	20 #else

21 static const int kMenuCornerRadiusForAura = 0;	21 static const int kMenuCornerRadiusForAura = 0;

22 #endif	22 #endif

(...skipping 30 matching lines...) Expand all Loading...
53 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {	53 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {

54 static MenuConfig* views_instance = NULL;	54 static MenuConfig* views_instance = NULL;

55 if (!views_instance)	55 if (!views_instance)

56 views_instance = new MenuConfig(theme ?	56 views_instance = new MenuConfig(theme ?

57 theme : ui::NativeTheme::instance());	57 theme : ui::NativeTheme::instance());

58 return *views_instance;	58 return *views_instance;

59 }	59 }

60 #endif	60 #endif

61	61

62 } // namespace views	62 } // namespace views

OLD	NEW

« no previous file with comments | « ui/views/controls/combobox/combobox.cc ('k') | ui/views/controls/menu/menu_image_util.cc » ('j') | no next file with comments »