Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: ui/base/resource/resource_bundle_aurax11.cc

Issue 10837142: Remove --load-2x-resources flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
OLDNEW
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"
11 #include "ui/base/resource/resource_handle.h" 11 #include "ui/base/resource/resource_handle.h"
12 #include "ui/base/ui_base_paths.h" 12 #include "ui/base/ui_base_paths.h"
13 #include "ui/base/ui_base_switches.h" 13 #include "ui/base/ui_base_switches.h"
14 #include "ui/gfx/display.h" 14 #include "ui/gfx/display.h"
15 #include "ui/gfx/image/image.h" 15 #include "ui/gfx/image/image.h"
16 16
17 namespace { 17 namespace {
18 18
19 FilePath GetResourcesPakFilePath(const std::string& pak_name) { 19 FilePath GetResourcesPakFilePath(const std::string& pak_name) {
20 FilePath path; 20 FilePath path;
21 if (PathService::Get(base::DIR_MODULE, &path)) 21 if (PathService::Get(base::DIR_MODULE, &path))
22 return path.AppendASCII(pak_name.c_str()); 22 return path.AppendASCII(pak_name.c_str());
23 23
24 // Return just the name of the pack file. 24 // Return just the name of the pack file.
25 return FilePath(pak_name.c_str()); 25 return FilePath(pak_name.c_str());
26 } 26 }
27 27
28 bool ShouldLoad2xResources() { 28 bool ShouldLoad2xResources() {
29 return gfx::Display::GetForcedDeviceScaleFactor() > 1.0f || 29 return gfx::Display::GetForcedDeviceScaleFactor() > 1.0f;
pkotwicz 2012/08/07 16:04:58 As per off line discussion, this should always ret
flackr 2012/08/07 18:47:50 Removed function.
30 CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoad2xResources);
31 } 30 }
32 31
33 } // namespace 32 } // namespace
34 33
35 namespace ui { 34 namespace ui {
36 35
37 void ResourceBundle::LoadCommonResources() { 36 void ResourceBundle::LoadCommonResources() {
38 // Always load the 1x data pack first as the 2x data pack contains both 1x and 37 // Always load the 1x data pack first as the 2x data pack contains both 1x and
39 // 2x images. The 1x data pack only has 1x images, thus passes in an accurate 38 // 2x images. The 1x data pack only has 1x images, thus passes in an accurate
40 // scale factor to gfx::ImageSkia::AddRepresentation. 39 // scale factor to gfx::ImageSkia::AddRepresentation.
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 84 }
86 } 85 }
87 86
88 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { 87 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
89 // Flipped image is not used on ChromeOS. 88 // Flipped image is not used on ChromeOS.
90 DCHECK_EQ(rtl, RTL_DISABLED); 89 DCHECK_EQ(rtl, RTL_DISABLED);
91 return GetImageNamed(resource_id); 90 return GetImageNamed(resource_id);
92 } 91 }
93 92
94 } // namespace ui 93 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698