OLD | NEW |
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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 internal::kShellWindowId_LockSystemModalContainer, | 367 internal::kShellWindowId_LockSystemModalContainer, |
368 GetPrimaryRootWindow()); | 368 GetPrimaryRootWindow()); |
369 for (std::vector<aura::Window*>::const_iterator iter = containers.begin(); | 369 for (std::vector<aura::Window*>::const_iterator iter = containers.begin(); |
370 iter != containers.end(); ++iter) { | 370 iter != containers.end(); ++iter) { |
371 DCHECK_EQ(0u, (*iter)->children().size()); | 371 DCHECK_EQ(0u, (*iter)->children().size()); |
372 } | 372 } |
373 } | 373 } |
374 #endif | 374 #endif |
375 } | 375 } |
376 | 376 |
| 377 void Shell::OnScreenSharingStateChanged(bool started) { |
| 378 #if defined(OS_CHROMEOS) && defined(USE_X11) |
| 379 if (output_configurator_) |
| 380 output_configurator_->OnScreenSharingStateChanged(started); |
| 381 #endif |
| 382 } |
| 383 |
377 void Shell::CreateShelf() { | 384 void Shell::CreateShelf() { |
378 RootWindowControllerList controllers = GetAllRootWindowControllers(); | 385 RootWindowControllerList controllers = GetAllRootWindowControllers(); |
379 for (RootWindowControllerList::iterator iter = controllers.begin(); | 386 for (RootWindowControllerList::iterator iter = controllers.begin(); |
380 iter != controllers.end(); ++iter) | 387 iter != controllers.end(); ++iter) |
381 (*iter)->shelf()->CreateShelf(); | 388 (*iter)->shelf()->CreateShelf(); |
382 } | 389 } |
383 | 390 |
384 void Shell::CreateKeyboard() { | 391 void Shell::CreateKeyboard() { |
385 // TODO(bshe): Primary root window controller may not be the controller to | 392 // TODO(bshe): Primary root window controller may not be the controller to |
386 // attach virtual keyboard. See http://crbug.com/303429 | 393 // attach virtual keyboard. See http://crbug.com/303429 |
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1030 //////////////////////////////////////////////////////////////////////////////// | 1037 //////////////////////////////////////////////////////////////////////////////// |
1031 // Shell, aura::client::ActivationChangeObserver implementation: | 1038 // Shell, aura::client::ActivationChangeObserver implementation: |
1032 | 1039 |
1033 void Shell::OnWindowActivated(aura::Window* gained_active, | 1040 void Shell::OnWindowActivated(aura::Window* gained_active, |
1034 aura::Window* lost_active) { | 1041 aura::Window* lost_active) { |
1035 if (gained_active) | 1042 if (gained_active) |
1036 target_root_window_ = gained_active->GetRootWindow(); | 1043 target_root_window_ = gained_active->GetRootWindow(); |
1037 } | 1044 } |
1038 | 1045 |
1039 } // namespace ash | 1046 } // namespace ash |
OLD | NEW |