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

Side by Side Diff: ash/shell.cc

Issue 2015043002: mash: Convert shelf to wm::WmWindow types, part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unused include Created 4 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
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 #include <utility> 9 #include <utility>
10 10
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 } 439 }
440 440
441 void Shell::OnRootWindowAdded(aura::Window* root_window) { 441 void Shell::OnRootWindowAdded(aura::Window* root_window) {
442 FOR_EACH_OBSERVER(ShellObserver, observers_, OnRootWindowAdded(root_window)); 442 FOR_EACH_OBSERVER(ShellObserver, observers_, OnRootWindowAdded(root_window));
443 } 443 }
444 444
445 void Shell::CreateShelf() { 445 void Shell::CreateShelf() {
446 RootWindowControllerList controllers = GetAllRootWindowControllers(); 446 RootWindowControllerList controllers = GetAllRootWindowControllers();
447 for (RootWindowControllerList::iterator iter = controllers.begin(); 447 for (RootWindowControllerList::iterator iter = controllers.begin();
448 iter != controllers.end(); ++iter) 448 iter != controllers.end(); ++iter)
449 (*iter)->shelf_widget()->CreateShelf(); 449 (*iter)->CreateShelf();
450 } 450 }
451 451
452 void Shell::OnShelfCreatedForRootWindow(aura::Window* root_window) { 452 void Shell::OnShelfCreatedForRootWindow(aura::Window* root_window) {
453 FOR_EACH_OBSERVER(ShellObserver, 453 FOR_EACH_OBSERVER(ShellObserver,
454 observers_, 454 observers_,
455 OnShelfCreatedForRootWindow(root_window)); 455 OnShelfCreatedForRootWindow(root_window));
456 } 456 }
457 457
458 void Shell::CreateKeyboard() { 458 void Shell::CreateKeyboard() {
459 if (in_mus_) 459 if (in_mus_)
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 1267
1268 void Shell::OnWindowActivated( 1268 void Shell::OnWindowActivated(
1269 aura::client::ActivationChangeObserver::ActivationReason reason, 1269 aura::client::ActivationChangeObserver::ActivationReason reason,
1270 aura::Window* gained_active, 1270 aura::Window* gained_active,
1271 aura::Window* lost_active) { 1271 aura::Window* lost_active) {
1272 if (gained_active) 1272 if (gained_active)
1273 target_root_window_ = gained_active->GetRootWindow(); 1273 target_root_window_ = gained_active->GetRootWindow();
1274 } 1274 }
1275 1275
1276 } // namespace ash 1276 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698