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

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

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac and win compile errors. 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
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 #pragma once 7 #pragma once
8 8
9 #include "ui/base/ui_export.h" 9 #include "ui/base/ui_export.h"
10 10
11 namespace ui { 11 namespace ui {
12 12
13 enum DisplayLayout { 13 enum DisplayLayout {
14 // Layout optimized for ASH. This enum value should go away as soon as 14 // Layout optimized for ASH. This enum value should go away as soon as
15 // LAYOUT_DESKTOP and LAYOUT_ASH are the same. 15 // LAYOUT_DESKTOP and LAYOUT_ASH are the same.
16 LAYOUT_ASH, 16 LAYOUT_ASH,
17 17
18 // The typical layout for e.g. Windows, Mac and Linux. 18 // The typical layout for e.g. Windows, Mac and Linux.
19 LAYOUT_DESKTOP, 19 LAYOUT_DESKTOP,
20 20
21 // Layout optimized for touch. Used e.g. for Windows 8 Metro mode. 21 // Layout optimized for touch. Used e.g. for Windows 8 Metro mode.
22 LAYOUT_TOUCH, 22 LAYOUT_TOUCH,
23 }; 23 };
24 24
25 // Returns the display layout that should be used. This could be used 25 // Returns the display layout that should be used. This could be used
26 // e.g. to tweak hard-coded padding that's layout specific, or choose 26 // e.g. to tweak hard-coded padding that's layout specific, or choose
27 // the .pak file of theme resources to load. 27 // the .pak file of theme resources to load.
28 UI_EXPORT DisplayLayout GetDisplayLayout(); 28 UI_EXPORT DisplayLayout GetDisplayLayout();
29 29
30 enum ScaleFactor {
31 SCALE_FACTOR_100P,
32 SCALE_FACTOR_200P
33 };
34
35 // The scale factor used for unscaled binary data, the 1x (default) scale factor
36 // data packs.
37 static const ScaleFactor kScaleFactorNone = SCALE_FACTOR_100P;
tony 2012/05/15 20:19:56 I think you can add this to the enum. SCALE_FACTOR
flackr 2012/05/16 13:39:23 Done.
38
30 } // namespace ui 39 } // namespace ui
31 40
32 #endif // UI_BASE_LAYOUT_H_ 41 #endif // UI_BASE_LAYOUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698