ui/base/resource/resource_bundle_auralinux.cc - Issue 13985039: Rationalize linux vs x11 in ui

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 13985039: Rationalize linux vs x11 in ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix review / try issues Created 7 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:

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"	7 #include "base/command_line.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/path_service.h"	9 #include "base/path_service.h"

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

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
45 }	45 }

46 }	46 }

47	47

48 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {	48 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {

49 // Flipped image is not used on ChromeOS.	49 // Flipped image is not used on ChromeOS.

50 DCHECK_EQ(rtl, RTL_DISABLED);	50 DCHECK_EQ(rtl, RTL_DISABLED);

51 return GetImageNamed(resource_id);	51 return GetImageNamed(resource_id);

52 }	52 }

53	53

54 } // namespace ui	54 } // namespace ui

OLD	NEW