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

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

Issue 14222019: Trying to activate a window in a workspace other than the current is ignored while a system modal d… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 8 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_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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // Overridden from aura::WindowObserver 85 // Overridden from aura::WindowObserver
86 virtual void OnWindowPropertyChanged(aura::Window* window, 86 virtual void OnWindowPropertyChanged(aura::Window* window,
87 const void* key, 87 const void* key,
88 intptr_t old) OVERRIDE; 88 intptr_t old) OVERRIDE;
89 virtual void OnWindowVisibilityChanged(aura::Window* window, 89 virtual void OnWindowVisibilityChanged(aura::Window* window,
90 bool visible) OVERRIDE; 90 bool visible) OVERRIDE;
91 91
92 // Overridden from aura::client::ActivationChangeObserver 92 // Overridden from aura::client::ActivationChangeObserver
93 virtual void OnWindowActivated(aura::Window* gained_active, 93 virtual void OnWindowActivated(aura::Window* gained_active,
94 aura::Window* lost_active) OVERRIDE; 94 aura::Window* lost_active) OVERRIDE;
95 virtual void OnWindowActivationRequestCompleted(
96 aura::Window* request_active, aura::Window* actual_active) OVERRIDE;
95 97
96 private: 98 private:
97 friend class PanelLayoutManagerTest; 99 friend class PanelLayoutManagerTest;
98 friend class PanelWindowResizerTest; 100 friend class PanelWindowResizerTest;
99 101
100 views::Widget* CreateCalloutWidget(); 102 views::Widget* CreateCalloutWidget();
101 103
102 struct PanelInfo{ 104 struct PanelInfo{
103 PanelInfo() : window(NULL), callout_widget(NULL) {} 105 PanelInfo() : window(NULL), callout_widget(NULL) {}
104 106
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 aura::Window* last_active_panel_; 146 aura::Window* last_active_panel_;
145 base::WeakPtrFactory<PanelLayoutManager> weak_factory_; 147 base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
146 148
147 DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager); 149 DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
148 }; 150 };
149 151
150 } // namespace internal 152 } // namespace internal
151 } // namespace ash 153 } // namespace ash
152 154
153 #endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ 155 #endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698