ui/base/resource/resource_bundle_auralinux.cc - Issue 1917083002: Move gfx::Display/Screen to display::Display/Screen in 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: ui/base/resource/resource_bundle_auralinux.cc

Issue 1917083002: Move gfx::Display/Screen to display::Display/Screen in ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

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/base/resource/resource_bundle.h"	5 #include "ui/base/resource/resource_bundle.h"

6	6

7 #include "base/command_line.h"

8 #include "base/logging.h"

9 #include "base/path_service.h"

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

11 #include "ui/base/resource/resource_handle.h"

12 #include "ui/base/ui_base_paths.h"

13 #include "ui/base/ui_base_switches.h"

14 #include "ui/gfx/display.h"

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

16

17 namespace ui {	7 namespace ui {

18	8

19 void ResourceBundle::LoadCommonResources() {	9 void ResourceBundle::LoadCommonResources() {

20 LoadChromeResources();	10 LoadChromeResources();

21 }	11 }

22	12

23 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {	13 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {

24 return GetImageNamed(resource_id);	14 return GetImageNamed(resource_id);

25 }	15 }

26	16

27 } // namespace ui	17 } // namespace ui

OLD	NEW

« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/x/x11_util.cc » ('j') | no next file with comments »