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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « ash/display/display_layout_store.cc ('k') | ash/display/display_manager.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 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 12 matching lines...) Expand all
23 namespace gfx { 23 namespace gfx {
24 class Display; 24 class Display;
25 class Insets; 25 class Insets;
26 class Rect; 26 class Rect;
27 class Screen; 27 class Screen;
28 } 28 }
29 29
30 namespace ash { 30 namespace ash {
31 class AcceleratorControllerTest; 31 class AcceleratorControllerTest;
32 class DisplayController; 32 class DisplayController;
33 class DisplayLayoutStore;
33 class ScreenAsh; 34 class ScreenAsh;
34 35
35 namespace test { 36 namespace test {
36 class DisplayManagerTestApi; 37 class DisplayManagerTestApi;
37 class SystemGestureEventFilterTest; 38 class SystemGestureEventFilterTest;
38 } 39 }
39 namespace internal {
40 class DisplayLayoutStore;
41 40
42 // DisplayManager maintains the current display configurations, 41 // DisplayManager maintains the current display configurations,
43 // and notifies observers when configuration changes. 42 // and notifies observers when configuration changes.
44 // 43 //
45 // TODO(oshima): Make this non internal. 44 // TODO(oshima): Make this non internal.
46 class ASH_EXPORT DisplayManager 45 class ASH_EXPORT DisplayManager
47 #if defined(OS_CHROMEOS) 46 #if defined(OS_CHROMEOS)
48 : public ui::OutputConfigurator::SoftwareMirroringController 47 : public ui::OutputConfigurator::SoftwareMirroringController
49 #endif 48 #endif
50 { 49 {
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 // on device as well as during the unit tests. 357 // on device as well as during the unit tests.
359 bool change_display_upon_host_resize_; 358 bool change_display_upon_host_resize_;
360 359
361 SecondDisplayMode second_display_mode_; 360 SecondDisplayMode second_display_mode_;
362 int64 mirrored_display_id_; 361 int64 mirrored_display_id_;
363 gfx::Display non_desktop_display_; 362 gfx::Display non_desktop_display_;
364 363
365 DISALLOW_COPY_AND_ASSIGN(DisplayManager); 364 DISALLOW_COPY_AND_ASSIGN(DisplayManager);
366 }; 365 };
367 366
368 } // namespace internal
369 } // namespace ash 367 } // namespace ash
370 368
371 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ 369 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/display/display_layout_store.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698