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

Side by Side Diff: ash/shell.cc

Issue 196473011: Attempting to reland the Overview Button Change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge in updates from Master Created 6 years, 9 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/shell.h ('k') | ash/shell_observer.h » ('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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/accelerator_controller.h" 10 #include "ash/accelerators/accelerator_controller.h"
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 } 381 }
382 382
383 void Shell::OnOverviewModeStarting() { 383 void Shell::OnOverviewModeStarting() {
384 FOR_EACH_OBSERVER(ShellObserver, observers_, OnOverviewModeStarting()); 384 FOR_EACH_OBSERVER(ShellObserver, observers_, OnOverviewModeStarting());
385 } 385 }
386 386
387 void Shell::OnOverviewModeEnding() { 387 void Shell::OnOverviewModeEnding() {
388 FOR_EACH_OBSERVER(ShellObserver, observers_, OnOverviewModeEnding()); 388 FOR_EACH_OBSERVER(ShellObserver, observers_, OnOverviewModeEnding());
389 } 389 }
390 390
391 void Shell::OnMaximizeModeStarted() {
392 FOR_EACH_OBSERVER(ShellObserver, observers_, OnMaximizeModeStarted());
393 }
394
395 void Shell::OnMaximizeModeEnded() {
396 FOR_EACH_OBSERVER(ShellObserver, observers_, OnMaximizeModeEnded());
397 }
398
391 void Shell::CreateShelf() { 399 void Shell::CreateShelf() {
392 RootWindowControllerList controllers = GetAllRootWindowControllers(); 400 RootWindowControllerList controllers = GetAllRootWindowControllers();
393 for (RootWindowControllerList::iterator iter = controllers.begin(); 401 for (RootWindowControllerList::iterator iter = controllers.begin();
394 iter != controllers.end(); ++iter) 402 iter != controllers.end(); ++iter)
395 (*iter)->shelf()->CreateShelf(); 403 (*iter)->shelf()->CreateShelf();
396 } 404 }
397 405
398 void Shell::CreateKeyboard() { 406 void Shell::CreateKeyboard() {
399 // TODO(bshe): Primary root window controller may not be the controller to 407 // TODO(bshe): Primary root window controller may not be the controller to
400 // attach virtual keyboard. See http://crbug.com/303429 408 // attach virtual keyboard. See http://crbug.com/303429
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 //////////////////////////////////////////////////////////////////////////////// 1106 ////////////////////////////////////////////////////////////////////////////////
1099 // Shell, aura::client::ActivationChangeObserver implementation: 1107 // Shell, aura::client::ActivationChangeObserver implementation:
1100 1108
1101 void Shell::OnWindowActivated(aura::Window* gained_active, 1109 void Shell::OnWindowActivated(aura::Window* gained_active,
1102 aura::Window* lost_active) { 1110 aura::Window* lost_active) {
1103 if (gained_active) 1111 if (gained_active)
1104 target_root_window_ = gained_active->GetRootWindow(); 1112 target_root_window_ = gained_active->GetRootWindow();
1105 } 1113 }
1106 1114
1107 } // namespace ash 1115 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/shell_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698