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

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

Issue 126513004: Rename RootWindowHost to WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 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/cancel_mode.cc ('k') | ash/display/display_controller.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_CONTROLLER_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_
6 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 6 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 const gfx::Display& GetDisplayMatching( 155 const gfx::Display& GetDisplayMatching(
156 const gfx::Rect& match_rect)const; 156 const gfx::Rect& match_rect)const;
157 157
158 // aura::DisplayObserver overrides: 158 // aura::DisplayObserver overrides:
159 virtual void OnDisplayBoundsChanged( 159 virtual void OnDisplayBoundsChanged(
160 const gfx::Display& display) OVERRIDE; 160 const gfx::Display& display) OVERRIDE;
161 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; 161 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
162 virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE; 162 virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE;
163 163
164 // RootWindowObserver overrides: 164 // RootWindowObserver overrides:
165 virtual void OnRootWindowHostResized(const aura::RootWindow* root) OVERRIDE; 165 virtual void OnWindowTreeHostResized(const aura::RootWindow* root) OVERRIDE;
166 166
167 // aura::DisplayManager::Delegate overrides: 167 // aura::DisplayManager::Delegate overrides:
168 virtual void CreateOrUpdateNonDesktopDisplay( 168 virtual void CreateOrUpdateNonDesktopDisplay(
169 const internal::DisplayInfo& info) OVERRIDE; 169 const internal::DisplayInfo& info) OVERRIDE;
170 virtual void CloseNonDesktopDisplay() OVERRIDE; 170 virtual void CloseNonDesktopDisplay() OVERRIDE;
171 virtual void PreDisplayConfigurationChange(bool clear_focus) OVERRIDE; 171 virtual void PreDisplayConfigurationChange(bool clear_focus) OVERRIDE;
172 virtual void PostDisplayConfigurationChange() OVERRIDE; 172 virtual void PostDisplayConfigurationChange() OVERRIDE;
173 173
174 private: 174 private:
175 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated); 175 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 // restore the cursor location when display configuration 224 // restore the cursor location when display configuration
225 // changed. 225 // changed.
226 gfx::Point cursor_location_in_native_coords_for_restore_; 226 gfx::Point cursor_location_in_native_coords_for_restore_;
227 227
228 DISALLOW_COPY_AND_ASSIGN(DisplayController); 228 DISALLOW_COPY_AND_ASSIGN(DisplayController);
229 }; 229 };
230 230
231 } // namespace ash 231 } // namespace ash
232 232
233 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ 233 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/cancel_mode.cc ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698