ui/views/controls/menu/menu_config_views.cc - Issue 10447066: views: Sort header files.

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_views.cc

Issue 10447066: views: Sort header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rm duplicated include Created 8 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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"	7 #include "grit/ui_resources.h"

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

	9 #include "ui/base/native_theme/native_theme_aura.h"

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

9 #include "ui/base/layout.h"

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

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

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

13	13

14 namespace views {	14 namespace views {

15	15

16 // static	16 // static

17 MenuConfig* MenuConfig::Create() {	17 MenuConfig* MenuConfig::Create() {

18 MenuConfig* config = new MenuConfig();	18 MenuConfig* config = new MenuConfig();

19 config->text_color = ui::NativeTheme::instance()->GetSystemColor(	19 config->text_color = ui::NativeTheme::instance()->GetSystemColor(

20 ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);	20 ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);

21 config->submenu_horizontal_margin_size = 0;	21 config->submenu_horizontal_margin_size = 0;

22 config->submenu_vertical_margin_size = 2;	22 config->submenu_vertical_margin_size = 2;

(...skipping 19 matching lines...) Expand all Loading...
42 }	42 }

43 config->label_to_arrow_padding = 20;	43 config->label_to_arrow_padding = 20;

44 config->label_to_accelerator_padding = 20;	44 config->label_to_accelerator_padding = 20;

45 config->always_use_icon_to_label_padding = true;	45 config->always_use_icon_to_label_padding = true;

46 config->align_arrow_and_shortcut = true;	46 config->align_arrow_and_shortcut = true;

47	47

48 return config;	48 return config;

49 }	49 }

50	50

51 } // namespace views	51 } // namespace views

OLD	NEW

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