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

Side by Side Diff: ash/display/display_manager.h

Issue 14710011: Redesign display options for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
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 ASH_DISPLAY_DISPLAY_MANAGER_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_
6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 26 matching lines...) Expand all
37 class ASH_EXPORT DisplayManager : public aura::RootWindowObserver { 37 class ASH_EXPORT DisplayManager : public aura::RootWindowObserver {
38 public: 38 public:
39 DisplayManager(); 39 DisplayManager();
40 virtual ~DisplayManager(); 40 virtual ~DisplayManager();
41 41
42 // Used to emulate display change when run in a desktop environment instead 42 // Used to emulate display change when run in a desktop environment instead
43 // of on a device. 43 // of on a device.
44 static void CycleDisplay(); 44 static void CycleDisplay();
45 static void ToggleDisplayScaleFactor(); 45 static void ToggleDisplayScaleFactor();
46 46
47 // Returns the list of possible UI scales for the display.
48 static std::vector<float> GetScalesForDisplay(const DisplayInfo& info);
49
47 // Returns next valid UI scale. 50 // Returns next valid UI scale.
48 static float GetNextUIScale(const DisplayInfo& info, bool up); 51 static float GetNextUIScale(const DisplayInfo& info, bool up);
49 52
50 // When set to true, the MonitorManager calls OnDisplayBoundsChanged 53 // When set to true, the MonitorManager calls OnDisplayBoundsChanged
51 // even if the display's bounds didn't change. Used to swap primary 54 // even if the display's bounds didn't change. Used to swap primary
52 // display. 55 // display.
53 void set_force_bounds_changed(bool force_bounds_changed) { 56 void set_force_bounds_changed(bool force_bounds_changed) {
54 force_bounds_changed_ = force_bounds_changed; 57 force_bounds_changed_ = force_bounds_changed;
55 } 58 }
56 59
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 229
227 DISALLOW_COPY_AND_ASSIGN(DisplayManager); 230 DISALLOW_COPY_AND_ASSIGN(DisplayManager);
228 }; 231 };
229 232
230 extern const aura::WindowProperty<int64>* const kDisplayIdKey; 233 extern const aura::WindowProperty<int64>* const kDisplayIdKey;
231 234
232 } // namespace internal 235 } // namespace internal
233 } // namespace ash 236 } // namespace ash
234 237
235 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ 238 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_manager.cc » ('j') | chrome/browser/resources/options/chromeos/display_options.css » ('J')

Powered by Google App Engine
This is Rietveld 408576698