views/controls/menu/menu_config_gtk.cc - Issue 6263008: Move ResourceBundle, DataPack to ui/base

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: views/controls/menu/menu_config_gtk.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 11 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

« no previous file with comments | « views/controls/listbox/native_listbox_win.cc ('k') | views/controls/menu/menu_item_view_gtk.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "views/controls/menu/menu_config.h"	5 #include "views/controls/menu/menu_config.h"

6	6

7 #include "app/resource_bundle.h"

8 #include "grit/app_resources.h"	7 #include "grit/app_resources.h"

9 #include "third_party/skia/include/core/SkBitmap.h"	8 #include "third_party/skia/include/core/SkBitmap.h"

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

10	10

11 namespace views {	11 namespace views {

12	12

13 // static	13 // static

14 MenuConfig* MenuConfig::Create() {	14 MenuConfig* MenuConfig::Create() {

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

16 ResourceBundle& rb = ResourceBundle::GetSharedInstance();	16 ResourceBundle& rb = ResourceBundle::GetSharedInstance();

17 config->font = rb.GetFont(ResourceBundle::BaseFont);	17 config->font = rb.GetFont(ResourceBundle::BaseFont);

18 config->arrow_width = rb.GetBitmapNamed(IDR_MENU_ARROW)->width();	18 config->arrow_width = rb.GetBitmapNamed(IDR_MENU_ARROW)->width();

19 // Add 4 to force some padding between check and label.	19 // Add 4 to force some padding between check and label.

20 config->check_width = rb.GetBitmapNamed(IDR_MENU_CHECK)->width() + 4;	20 config->check_width = rb.GetBitmapNamed(IDR_MENU_CHECK)->width() + 4;

21 config->check_height = rb.GetBitmapNamed(IDR_MENU_CHECK)->height();	21 config->check_height = rb.GetBitmapNamed(IDR_MENU_CHECK)->height();

22 return config;	22 return config;

23 }	23 }

24	24

25 } // namespace views	25 } // namespace views

OLD	NEW