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

Side by Side Diff: ash/shell.cc

Issue 139053003: Chrome OS: avoid suspending on lid close when casting is active. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another nit. Created 6 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/shell.h ('k') | chrome/browser/media/media_capture_devices_dispatcher.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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 internal::kShellWindowId_LockSystemModalContainer, 384 internal::kShellWindowId_LockSystemModalContainer,
385 GetPrimaryRootWindow()); 385 GetPrimaryRootWindow());
386 for (std::vector<aura::Window*>::const_iterator iter = containers.begin(); 386 for (std::vector<aura::Window*>::const_iterator iter = containers.begin();
387 iter != containers.end(); ++iter) { 387 iter != containers.end(); ++iter) {
388 DCHECK_EQ(0u, (*iter)->children().size()); 388 DCHECK_EQ(0u, (*iter)->children().size());
389 } 389 }
390 } 390 }
391 #endif 391 #endif
392 } 392 }
393 393
394 void Shell::OnCastingSessionStartedOrStopped(bool started) {
395 #if defined(OS_CHROMEOS) && defined(USE_X11)
396 if (output_configurator_)
397 output_configurator_->OnCastingSessionStartedOrStopped(started);
398 #endif
399 }
400
394 void Shell::CreateShelf() { 401 void Shell::CreateShelf() {
395 RootWindowControllerList controllers = GetAllRootWindowControllers(); 402 RootWindowControllerList controllers = GetAllRootWindowControllers();
396 for (RootWindowControllerList::iterator iter = controllers.begin(); 403 for (RootWindowControllerList::iterator iter = controllers.begin();
397 iter != controllers.end(); ++iter) 404 iter != controllers.end(); ++iter)
398 (*iter)->shelf()->CreateShelf(); 405 (*iter)->shelf()->CreateShelf();
399 } 406 }
400 407
401 void Shell::CreateKeyboard() { 408 void Shell::CreateKeyboard() {
402 // TODO(bshe): Primary root window controller may not be the controller to 409 // TODO(bshe): Primary root window controller may not be the controller to
403 // attach virtual keyboard. See http://crbug.com/303429 410 // attach virtual keyboard. See http://crbug.com/303429
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 //////////////////////////////////////////////////////////////////////////////// 1065 ////////////////////////////////////////////////////////////////////////////////
1059 // Shell, aura::client::ActivationChangeObserver implementation: 1066 // Shell, aura::client::ActivationChangeObserver implementation:
1060 1067
1061 void Shell::OnWindowActivated(aura::Window* gained_active, 1068 void Shell::OnWindowActivated(aura::Window* gained_active,
1062 aura::Window* lost_active) { 1069 aura::Window* lost_active) {
1063 if (gained_active) 1070 if (gained_active)
1064 target_root_window_ = gained_active->GetRootWindow(); 1071 target_root_window_ = gained_active->GetRootWindow();
1065 } 1072 }
1066 1073
1067 } // namespace ash 1074 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | chrome/browser/media/media_capture_devices_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698