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

Side by Side Diff: ui/aura/single_display_manager.h

Issue 10826198: Use persistent ID/names for displays. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove persistent_id() and change id() to int64 Created 8 years, 4 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_AURA_SINGLE_DISPLAY_MANAGER_H_ 5 #ifndef UI_AURA_SINGLE_DISPLAY_MANAGER_H_
6 #define UI_AURA_SINGLE_DISPLAY_MANAGER_H_ 6 #define UI_AURA_SINGLE_DISPLAY_MANAGER_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "ui/aura/aura_export.h" 9 #include "ui/aura/aura_export.h"
10 #include "ui/aura/display_manager.h" 10 #include "ui/aura/display_manager.h"
(...skipping 21 matching lines...) Expand all
32 virtual gfx::Display* GetDisplayAt(size_t index) OVERRIDE; 32 virtual gfx::Display* GetDisplayAt(size_t index) OVERRIDE;
33 33
34 virtual size_t GetNumDisplays() const OVERRIDE; 34 virtual size_t GetNumDisplays() const OVERRIDE;
35 35
36 virtual const gfx::Display& GetDisplayNearestWindow( 36 virtual const gfx::Display& GetDisplayNearestWindow(
37 const Window* window) const OVERRIDE; 37 const Window* window) const OVERRIDE;
38 virtual const gfx::Display& GetDisplayNearestPoint( 38 virtual const gfx::Display& GetDisplayNearestPoint(
39 const gfx::Point& point) const OVERRIDE; 39 const gfx::Point& point) const OVERRIDE;
40 virtual const gfx::Display& GetDisplayMatching( 40 virtual const gfx::Display& GetDisplayMatching(
41 const gfx::Rect& match_rect) const OVERRIDE; 41 const gfx::Rect& match_rect) const OVERRIDE;
42 virtual std::string GetDisplayNameAt(size_t index) OVERRIDE;
42 43
43 // WindowObserver overrides: 44 // WindowObserver overrides:
44 virtual void OnWindowBoundsChanged(Window* window, 45 virtual void OnWindowBoundsChanged(Window* window,
45 const gfx::Rect& old_bounds, 46 const gfx::Rect& old_bounds,
46 const gfx::Rect& new_bounds) OVERRIDE; 47 const gfx::Rect& new_bounds) OVERRIDE;
47 virtual void OnWindowDestroying(Window* window) OVERRIDE; 48 virtual void OnWindowDestroying(Window* window) OVERRIDE;
48 49
49 private: 50 private:
50 void Init(); 51 void Init();
51 void Update(const gfx::Size size); 52 void Update(const gfx::Size size);
52 53
53 RootWindow* root_window_; 54 RootWindow* root_window_;
54 gfx::Display display_; 55 gfx::Display display_;
55 56
56 DISALLOW_COPY_AND_ASSIGN(SingleDisplayManager); 57 DISALLOW_COPY_AND_ASSIGN(SingleDisplayManager);
57 }; 58 };
58 59
59 } // namespace aura 60 } // namespace aura
60 61
61 #endif // UI_AURA_SINGLE_DISPLAY_MANAGER_H_ 62 #endif // UI_AURA_SINGLE_DISPLAY_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698