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

Side by Side Diff: ash/shell/window_watcher.h

Issue 259253002: Add OnDisplayMetricsChanged in DisplayObserver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@update_orientation
Patch Set: jochen comments (inc. git cl format) Created 6 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
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_SHELL_WINDOW_WATCHER_H_ 5 #ifndef ASH_SHELL_WINDOW_WATCHER_H_
6 #define ASH_SHELL_WINDOW_WATCHER_H_ 6 #define ASH_SHELL_WINDOW_WATCHER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/shelf/shelf_item_types.h" 10 #include "ash/shelf/shelf_item_types.h"
(...skipping 20 matching lines...) Expand all
31 WindowWatcher(); 31 WindowWatcher();
32 virtual ~WindowWatcher(); 32 virtual ~WindowWatcher();
33 33
34 aura::Window* GetWindowByID(ash::ShelfID id); 34 aura::Window* GetWindowByID(ash::ShelfID id);
35 35
36 // aura::WindowObserver overrides: 36 // aura::WindowObserver overrides:
37 virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE; 37 virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;
38 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; 38 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE;
39 39
40 // gfx::DisplayObserver overrides: 40 // gfx::DisplayObserver overrides:
41 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE;
42 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; 41 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
43 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; 42 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
43 virtual void OnDisplayMetricsChanged(
44 const gfx::Display& display,
45 DisplayObserver::DisplayMetrics metrics) OVERRIDE;
44 46
45 private: 47 private:
46 class WorkspaceWindowWatcher; 48 class WorkspaceWindowWatcher;
47 49
48 typedef std::map<ash::ShelfID, aura::Window*> IDToWindow; 50 typedef std::map<ash::ShelfID, aura::Window*> IDToWindow;
49 51
50 // Maps from window to the id we gave it. 52 // Maps from window to the id we gave it.
51 IDToWindow id_to_window_; 53 IDToWindow id_to_window_;
52 54
53 scoped_ptr<WorkspaceWindowWatcher> workspace_window_watcher_; 55 scoped_ptr<WorkspaceWindowWatcher> workspace_window_watcher_;
54 56
55 DISALLOW_COPY_AND_ASSIGN(WindowWatcher); 57 DISALLOW_COPY_AND_ASSIGN(WindowWatcher);
56 }; 58 };
57 59
58 } // namespace shell 60 } // namespace shell
59 } // namespace ash 61 } // namespace ash
60 62
61 #endif // ASH_SHELL_WINDOW_WATCHER_H_ 63 #endif // ASH_SHELL_WINDOW_WATCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698