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

Side by Side Diff: ash/wm/workspace_controller.cc

Issue 11830008: ash/immersive mode: Hide the launcher when entering immersive mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move logic to RootWindowController Created 7 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/wm/workspace_controller.h ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.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 #include "ash/wm/workspace_controller.h" 5 #include "ash/wm/workspace_controller.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/wm/window_util.h" 8 #include "ash/wm/window_util.h"
9 #include "ash/wm/workspace/workspace_cycler.h" 9 #include "ash/wm/workspace/workspace_cycler.h"
10 #include "ash/wm/workspace/workspace_manager.h" 10 #include "ash/wm/workspace/workspace_manager.h"
(...skipping 28 matching lines...) Expand all
39 } 39 }
40 40
41 void WorkspaceController::SetShelf(ShelfLayoutManager* shelf) { 41 void WorkspaceController::SetShelf(ShelfLayoutManager* shelf) {
42 workspace_manager_->SetShelf(shelf); 42 workspace_manager_->SetShelf(shelf);
43 } 43 }
44 44
45 void WorkspaceController::SetActiveWorkspaceByWindow(aura::Window* window) { 45 void WorkspaceController::SetActiveWorkspaceByWindow(aura::Window* window) {
46 return workspace_manager_->SetActiveWorkspaceByWindow(window); 46 return workspace_manager_->SetActiveWorkspaceByWindow(window);
47 } 47 }
48 48
49 aura::Window* WorkspaceController::GetActiveWorkspaceWindow() {
50 return workspace_manager_->GetActiveWorkspaceWindow();
51 }
52
49 aura::Window* WorkspaceController::GetParentForNewWindow(aura::Window* window) { 53 aura::Window* WorkspaceController::GetParentForNewWindow(aura::Window* window) {
50 return workspace_manager_->GetParentForNewWindow(window); 54 return workspace_manager_->GetParentForNewWindow(window);
51 } 55 }
52 56
53
54 void WorkspaceController::DoInitialAnimation() { 57 void WorkspaceController::DoInitialAnimation() {
55 workspace_manager_->DoInitialAnimation(); 58 workspace_manager_->DoInitialAnimation();
56 } 59 }
57 60
58 void WorkspaceController::OnWindowActivated(aura::Window* gained_active, 61 void WorkspaceController::OnWindowActivated(aura::Window* gained_active,
59 aura::Window* lost_active) { 62 aura::Window* lost_active) {
60 if (!gained_active || 63 if (!gained_active ||
61 gained_active->GetRootWindow() == viewport_->GetRootWindow()) { 64 gained_active->GetRootWindow() == viewport_->GetRootWindow()) {
62 workspace_manager_->SetActiveWorkspaceByWindow(gained_active); 65 workspace_manager_->SetActiveWorkspaceByWindow(gained_active);
63 } 66 }
64 } 67 }
65 68
66 } // namespace internal 69 } // namespace internal
67 } // namespace ash 70 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698