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

Side by Side Diff: ash/shelf/shelf_layout_manager.h

Issue 2904073002: [mus+ash] Removes WmWindow from ash/wm/screen_pinning_controller.h (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/wm/screen_pinning_controller.h (removes unneeded header) Created 3 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
« no previous file with comments | « ash/accelerators/accelerator_commands_aura.cc ('k') | ash/shelf/shelf_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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // shelf. Specifying 0 leads to use the default. 128 // shelf. Specifying 0 leads to use the default.
129 void SetAnimationDurationOverride(int duration_override_in_ms); 129 void SetAnimationDurationOverride(int duration_override_in_ms);
130 130
131 // Overridden from wm::WmSnapToPixelLayoutManager: 131 // Overridden from wm::WmSnapToPixelLayoutManager:
132 void OnWindowResized() override; 132 void OnWindowResized() override;
133 void SetChildBounds(aura::Window* child, 133 void SetChildBounds(aura::Window* child,
134 const gfx::Rect& requested_bounds) override; 134 const gfx::Rect& requested_bounds) override;
135 135
136 // Overridden from ShellObserver: 136 // Overridden from ShellObserver:
137 void OnShelfAutoHideBehaviorChanged(WmWindow* root_window) override; 137 void OnShelfAutoHideBehaviorChanged(WmWindow* root_window) override;
138 void OnPinnedStateChanged(WmWindow* pinned_window) override; 138 void OnPinnedStateChanged(aura::Window* pinned_window) override;
139 void OnVirtualKeyboardStateChanged(bool activated, 139 void OnVirtualKeyboardStateChanged(bool activated,
140 aura::Window* root_window) override; 140 aura::Window* root_window) override;
141 141
142 // Overridden from aura::client::ActivationChangeObserver: 142 // Overridden from aura::client::ActivationChangeObserver:
143 void OnWindowActivated(ActivationReason reason, 143 void OnWindowActivated(ActivationReason reason,
144 aura::Window* gained_active, 144 aura::Window* gained_active,
145 aura::Window* lost_active) override; 145 aura::Window* lost_active) override;
146 146
147 // Overridden from keyboard::KeyboardControllerObserver: 147 // Overridden from keyboard::KeyboardControllerObserver:
148 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; 148 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 keyboard::KeyboardControllerObserver> 365 keyboard::KeyboardControllerObserver>
366 keyboard_observer_; 366 keyboard_observer_;
367 ScopedSessionObserver scoped_session_observer_; 367 ScopedSessionObserver scoped_session_observer_;
368 368
369 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 369 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
370 }; 370 };
371 371
372 } // namespace ash 372 } // namespace ash
373 373
374 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 374 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_commands_aura.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698