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

Side by Side Diff: ash/wm/dock/docked_window_layout_manager.h

Issue 139013006: Revert 245031 "This CL" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1795/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/system/tray/tray_background_view.cc ('k') | ash/wm/dock/docked_window_layout_manager.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
6 #define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ 6 #define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/shelf_layout_manager_observer.h" 9 #include "ash/shelf/shelf_layout_manager_observer.h"
10 #include "ash/shell_observer.h" 10 #include "ash/shell_observer.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 BackgroundAnimatorChangeType change_type) OVERRIDE; 159 BackgroundAnimatorChangeType change_type) OVERRIDE;
160 160
161 // wm::WindowStateObserver: 161 // wm::WindowStateObserver:
162 virtual void OnWindowShowTypeChanged(wm::WindowState* window_state, 162 virtual void OnWindowShowTypeChanged(wm::WindowState* window_state,
163 wm::WindowShowType old_type) OVERRIDE; 163 wm::WindowShowType old_type) OVERRIDE;
164 164
165 // aura::WindowObserver: 165 // aura::WindowObserver:
166 virtual void OnWindowBoundsChanged(aura::Window* window, 166 virtual void OnWindowBoundsChanged(aura::Window* window,
167 const gfx::Rect& old_bounds, 167 const gfx::Rect& old_bounds,
168 const gfx::Rect& new_bounds) OVERRIDE; 168 const gfx::Rect& new_bounds) OVERRIDE;
169 virtual void OnWindowVisibilityChanging(aura::Window* window,
170 bool visible) OVERRIDE;
169 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 171 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
170 172
171 // aura::client::ActivationChangeObserver: 173 // aura::client::ActivationChangeObserver:
172 virtual void OnWindowActivated(aura::Window* gained_active, 174 virtual void OnWindowActivated(aura::Window* gained_active,
173 aura::Window* lost_active) OVERRIDE; 175 aura::Window* lost_active) OVERRIDE;
174 176
175 private: 177 private:
176 class ShelfWindowObserver; 178 class ShelfWindowObserver;
177 friend class DockedWindowLayoutManagerTest; 179 friend class DockedWindowLayoutManagerTest;
178 friend class DockedWindowResizerTest; 180 friend class DockedWindowResizerTest;
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 // Observers of dock bounds changes. 306 // Observers of dock bounds changes.
305 ObserverList<DockedWindowLayoutManagerObserver> observer_list_; 307 ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
306 308
307 DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager); 309 DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
308 }; 310 };
309 311
310 } // namespace internal 312 } // namespace internal
311 } // namespace ash 313 } // namespace ash
312 314
313 #endif // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ 315 #endif // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698