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

Side by Side Diff: ash/wm/panels/panel_layout_manager.h

Issue 1151133003: Added an ActivationReason parameter to ActivationChangeObserver::OnWindowActivated(...). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Uploaded diff based on dependant CL. Created 5 years, 6 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
« no previous file with comments | « ash/wm/overview/window_selector.cc ('k') | ash/wm/panels/panel_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) 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_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
6 #define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ 6 #define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // Overridden from aura::WindowObserver 101 // Overridden from aura::WindowObserver
102 void OnWindowPropertyChanged(aura::Window* window, 102 void OnWindowPropertyChanged(aura::Window* window,
103 const void* key, 103 const void* key,
104 intptr_t old) override; 104 intptr_t old) override;
105 105
106 // Overridden from ash::wm::WindowStateObserver 106 // Overridden from ash::wm::WindowStateObserver
107 void OnPostWindowStateTypeChange(wm::WindowState* window_state, 107 void OnPostWindowStateTypeChange(wm::WindowState* window_state,
108 wm::WindowStateType old_type) override; 108 wm::WindowStateType old_type) override;
109 109
110 // Overridden from aura::client::ActivationChangeObserver 110 // Overridden from aura::client::ActivationChangeObserver
111 void OnWindowActivated(aura::Window* gained_active, 111 void OnWindowActivated(
112 aura::Window* lost_active) override; 112 aura::client::ActivationChangeObserver::ActivationReason reason,
113 aura::Window* gained_active,
114 aura::Window* lost_active) override;
113 115
114 // Overridden from DisplayController::Observer 116 // Overridden from DisplayController::Observer
115 void OnDisplayConfigurationChanged() override; 117 void OnDisplayConfigurationChanged() override;
116 118
117 // Overridden from ShelfLayoutManagerObserver 119 // Overridden from ShelfLayoutManagerObserver
118 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; 120 void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
119 121
120 private: 122 private:
121 friend class PanelLayoutManagerTest; 123 friend class PanelLayoutManagerTest;
122 friend class PanelWindowResizerTest; 124 friend class PanelWindowResizerTest;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 // are currently focused. 193 // are currently focused.
192 aura::Window* last_active_panel_; 194 aura::Window* last_active_panel_;
193 base::WeakPtrFactory<PanelLayoutManager> weak_factory_; 195 base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
194 196
195 DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager); 197 DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
196 }; 198 };
197 199
198 } // namespace ash 200 } // namespace ash
199 201
200 #endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ 202 #endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector.cc ('k') | ash/wm/panels/panel_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698