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

Side by Side Diff: ui/base/layout.h

Issue 211493009: Ensure that extension resources are loaded with the correct scaling applied on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed the GetImageScaleForScaleFactor function Created 6 years, 8 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 | « no previous file | ui/base/layout.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef UI_BASE_LAYOUT_H_ 5 #ifndef UI_BASE_LAYOUT_H_
6 #define UI_BASE_LAYOUT_H_ 6 #define UI_BASE_LAYOUT_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 29 matching lines...) Expand all
40 SCALE_FACTOR_133P, 40 SCALE_FACTOR_133P,
41 SCALE_FACTOR_140P, 41 SCALE_FACTOR_140P,
42 SCALE_FACTOR_150P, 42 SCALE_FACTOR_150P,
43 SCALE_FACTOR_180P, 43 SCALE_FACTOR_180P,
44 SCALE_FACTOR_200P, 44 SCALE_FACTOR_200P,
45 SCALE_FACTOR_300P, 45 SCALE_FACTOR_300P,
46 46
47 NUM_SCALE_FACTORS // This always appears last. 47 NUM_SCALE_FACTORS // This always appears last.
48 }; 48 };
49 49
50 // List of scales for each scale factor defined above
51 extern float g_kScaleFactorScales[NUM_SCALE_FACTORS];
sky 2014/03/27 15:43:07 I don't like exposing this. For one it isn't const
ananta 2014/03/27 19:05:07 Done.
52
50 // Changes the value of GetSupportedScaleFactors() to |scale_factors|. 53 // Changes the value of GetSupportedScaleFactors() to |scale_factors|.
51 // Use ScopedSetSupportedScaleFactors for unit tests as not to affect the 54 // Use ScopedSetSupportedScaleFactors for unit tests as not to affect the
52 // state of other tests. 55 // state of other tests.
53 UI_BASE_EXPORT void SetSupportedScaleFactors( 56 UI_BASE_EXPORT void SetSupportedScaleFactors(
54 const std::vector<ScaleFactor>& scale_factors); 57 const std::vector<ScaleFactor>& scale_factors);
55 58
56 // Returns a vector with the scale factors which are supported by this 59 // Returns a vector with the scale factors which are supported by this
57 // platform, in ascending order. 60 // platform, in ascending order.
58 UI_BASE_EXPORT const std::vector<ScaleFactor>& GetSupportedScaleFactors(); 61 UI_BASE_EXPORT const std::vector<ScaleFactor>& GetSupportedScaleFactors();
59 62
60 // Returns the float scale value for |scale_factor|. 63 // Returns the actual image scale to be used for the scale factor passed in.
64 // On Windows high dpi, this returns the dpi scale for the display.
61 UI_BASE_EXPORT float GetImageScale(ScaleFactor scale_factor); 65 UI_BASE_EXPORT float GetImageScale(ScaleFactor scale_factor);
62 66
63 // Returns the supported ScaleFactor which most closely matches |scale|. 67 // Returns the supported ScaleFactor which most closely matches |scale|.
64 // Converting from float to ScaleFactor is inefficient and should be done as 68 // Converting from float to ScaleFactor is inefficient and should be done as
65 // little as possible. 69 // little as possible.
66 // TODO(oshima): Make ScaleFactor a class and remove this. 70 // TODO(oshima): Make ScaleFactor a class and remove this.
67 UI_BASE_EXPORT ScaleFactor GetSupportedScaleFactor(float image_scale); 71 UI_BASE_EXPORT ScaleFactor GetSupportedScaleFactor(float image_scale);
68 72
69 // Returns the ScaleFactor used by |view|. 73 // Returns the ScaleFactor used by |view|.
70 UI_BASE_EXPORT ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view); 74 UI_BASE_EXPORT ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view);
(...skipping 19 matching lines...) Expand all
90 std::vector<ui::ScaleFactor>* original_scale_factors_; 94 std::vector<ui::ScaleFactor>* original_scale_factors_;
91 95
92 DISALLOW_COPY_AND_ASSIGN(ScopedSetSupportedScaleFactors); 96 DISALLOW_COPY_AND_ASSIGN(ScopedSetSupportedScaleFactors);
93 }; 97 };
94 98
95 } // namespace test 99 } // namespace test
96 100
97 } // namespace ui 101 } // namespace ui
98 102
99 #endif // UI_BASE_LAYOUT_H_ 103 #endif // UI_BASE_LAYOUT_H_
OLDNEW
« no previous file with comments | « no previous file | ui/base/layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698