ui/base/resource/resource_bundle_aurax11.cc - Issue 10399118: 2x Cursor support.

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

Issue 10399118: 2x Cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remoev extra space Created 8 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 | Annotate | Revision Log

« ui/aura/root_window_host_linux.cc ('K') | « ui/aura/window.h ('k') | no next file » | no next file with comments »

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

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

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

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

(...skipping 22 matching lines...) Expand all Loading...
33 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {	33 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {

34 AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),	34 AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),

35 ResourceHandle::kScaleFactor100x);	35 ResourceHandle::kScaleFactor100x);

36 AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"),	36 AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"),

37 ResourceHandle::kScaleFactor100x);	37 ResourceHandle::kScaleFactor100x);

38 } else {	38 } else {

39 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),	39 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),

40 ResourceHandle::kScaleFactor100x);	40 ResourceHandle::kScaleFactor100x);

41 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),	41 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),

42 ResourceHandle::kScaleFactor100x);	42 ResourceHandle::kScaleFactor100x);

	43 AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),

	44 ResourceHandle::kScaleFactor200x);

43 }	45 }

44 }	46 }

45	47

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

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

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

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

50 }	52 }

51	53

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

OLD	NEW