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

Side by Side Diff: ash/shelf/shelf_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SHELF_SHELF_WINDOW_WATCHER_H_ 5 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_
6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
7 7
8 #include "ash/shelf/scoped_observer_with_duplicated_sources.h" 8 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 // aura::WindowObserver overrides: 109 // aura::WindowObserver overrides:
110 virtual void OnWindowAdded(aura::Window* window) OVERRIDE; 110 virtual void OnWindowAdded(aura::Window* window) OVERRIDE;
111 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; 111 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE;
112 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 112 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
113 virtual void OnWindowPropertyChanged(aura::Window* window, 113 virtual void OnWindowPropertyChanged(aura::Window* window,
114 const void* key, 114 const void* key,
115 intptr_t old) OVERRIDE; 115 intptr_t old) OVERRIDE;
116 116
117 // gfx::DisplayObserver overrides: 117 // gfx::DisplayObserver overrides:
118 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE;
119 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE; 118 virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
120 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; 119 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
120 virtual void OnDisplayMetricsChanged(
121 const gfx::Display& display,
122 DisplayObserver::DisplayMetrics metrics) OVERRIDE;
121 123
122 // Owned by Shell. 124 // Owned by Shell.
123 ShelfModel* model_; 125 ShelfModel* model_;
124 ShelfItemDelegateManager* item_delegate_manager_; 126 ShelfItemDelegateManager* item_delegate_manager_;
125 127
126 RootWindowObserver root_window_observer_; 128 RootWindowObserver root_window_observer_;
127 129
128 RemovedWindowObserver removed_window_observer_; 130 RemovedWindowObserver removed_window_observer_;
129 131
130 // Holds all observed windows. 132 // Holds all observed windows.
131 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; 133 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
132 134
133 // Holds all observed root windows. 135 // Holds all observed root windows.
134 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_; 136 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_;
135 137
136 // Holds removed windows that has an item from default container. 138 // Holds removed windows that has an item from default container.
137 ScopedObserver<aura::Window, aura::WindowObserver> observed_removed_windows_; 139 ScopedObserver<aura::Window, aura::WindowObserver> observed_removed_windows_;
138 140
139 // Holds all observed activation clients. 141 // Holds all observed activation clients.
140 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient, 142 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
141 aura::client::ActivationChangeObserver> observed_activation_clients_; 143 aura::client::ActivationChangeObserver> observed_activation_clients_;
142 144
143 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher); 145 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
144 }; 146 };
145 147
146 } // namespace ash 148 } // namespace ash
147 149
148 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 150 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698