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

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

Issue 2383313002: Remove ash localization from display_manager.cc (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « no previous file | ash/display/display_manager.cc » ('j') | ash/display/display_manager.cc » ('J')
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // Called before and after the display configuration changes. 70 // Called before and after the display configuration changes.
71 // When |clear_focus| is true, the implementation should 71 // When |clear_focus| is true, the implementation should
72 // deactivate the active window and set the focus window to NULL. 72 // deactivate the active window and set the focus window to NULL.
73 virtual void PreDisplayConfigurationChange(bool clear_focus) = 0; 73 virtual void PreDisplayConfigurationChange(bool clear_focus) = 0;
74 virtual void PostDisplayConfigurationChange() = 0; 74 virtual void PostDisplayConfigurationChange() = 0;
75 75
76 #if defined(OS_CHROMEOS) 76 #if defined(OS_CHROMEOS)
77 // Get the ui::DisplayConfigurator. 77 // Get the ui::DisplayConfigurator.
78 virtual ui::DisplayConfigurator* display_configurator() = 0; 78 virtual ui::DisplayConfigurator* display_configurator() = 0;
79 #endif 79 #endif
80
81 virtual std::string GetInternalDisplayNameString() = 0;
82 virtual std::string GetUnknownDisplayNameString() = 0;
80 }; 83 };
81 84
82 // How the second display will be used. 85 // How the second display will be used.
83 // 1) EXTENDED mode extends the desktop to the second dislpay. 86 // 1) EXTENDED mode extends the desktop to the second dislpay.
84 // 2) MIRRORING mode copies the content of the primary display to 87 // 2) MIRRORING mode copies the content of the primary display to
85 // the 2nd display. (Software Mirroring). 88 // the 2nd display. (Software Mirroring).
86 // 3) UNIFIED mode creates single desktop across multiple displays. 89 // 3) UNIFIED mode creates single desktop across multiple displays.
87 enum MultiDisplayMode { 90 enum MultiDisplayMode {
88 EXTENDED = 0, 91 EXTENDED = 0,
89 MIRRORING, 92 MIRRORING,
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 base::ObserverList<display::DisplayObserver> observers_; 475 base::ObserverList<display::DisplayObserver> observers_;
473 476
474 base::WeakPtrFactory<DisplayManager> weak_ptr_factory_; 477 base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
475 478
476 DISALLOW_COPY_AND_ASSIGN(DisplayManager); 479 DISALLOW_COPY_AND_ASSIGN(DisplayManager);
477 }; 480 };
478 481
479 } // namespace ash 482 } // namespace ash
480 483
481 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ 484 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_manager.cc » ('j') | ash/display/display_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698