| 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/focus_manager_factory.h" | 10 #include "ash/accelerators/focus_manager_factory.h" |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 delegate_(delegate), | 557 delegate_(delegate), |
| 558 #if defined(OS_CHROMEOS) | 558 #if defined(OS_CHROMEOS) |
| 559 output_configurator_(new chromeos::OutputConfigurator()), | 559 output_configurator_(new chromeos::OutputConfigurator()), |
| 560 #endif // defined(OS_CHROMEOS) | 560 #endif // defined(OS_CHROMEOS) |
| 561 shelf_(NULL), | 561 shelf_(NULL), |
| 562 panel_layout_manager_(NULL), | 562 panel_layout_manager_(NULL), |
| 563 root_window_layout_(NULL), | 563 root_window_layout_(NULL), |
| 564 status_area_widget_(NULL), | 564 status_area_widget_(NULL), |
| 565 browser_context_(NULL) { | 565 browser_context_(NULL) { |
| 566 gfx::Screen::SetInstance(screen_); | 566 gfx::Screen::SetInstance(screen_); |
| 567 ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get())); | 567 ui_controls::InstallUIControlsAura(internal::CreateUIControls()); |
| 568 #if defined(OS_CHROMEOS) | 568 #if defined(OS_CHROMEOS) |
| 569 // OutputConfigurator needs to get events regarding added/removed outputs. | 569 // OutputConfigurator needs to get events regarding added/removed outputs. |
| 570 static_cast<aura::DispatcherLinux*>( | 570 static_cast<aura::DispatcherLinux*>( |
| 571 aura::Env::GetInstance()->GetDispatcher())->AddDispatcherForRootWindow( | 571 aura::Env::GetInstance()->GetDispatcher())->AddDispatcherForRootWindow( |
| 572 output_configurator()); | 572 output_configurator()); |
| 573 #endif // defined(OS_CHROMEOS) | 573 #endif // defined(OS_CHROMEOS) |
| 574 } | 574 } |
| 575 | 575 |
| 576 Shell::~Shell() { | 576 Shell::~Shell() { |
| 577 views::FocusManagerFactory::Install(NULL); | 577 views::FocusManagerFactory::Install(NULL); |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1073 void Shell::SetCursor(gfx::NativeCursor cursor) { | 1073 void Shell::SetCursor(gfx::NativeCursor cursor) { |
| 1074 // TODO(oshima): set cursor to all root windows. | 1074 // TODO(oshima): set cursor to all root windows. |
| 1075 GetPrimaryRootWindow()->SetCursor(cursor); | 1075 GetPrimaryRootWindow()->SetCursor(cursor); |
| 1076 } | 1076 } |
| 1077 | 1077 |
| 1078 void Shell::ShowCursor(bool visible) { | 1078 void Shell::ShowCursor(bool visible) { |
| 1079 GetPrimaryRootWindow()->ShowCursor(visible); | 1079 GetPrimaryRootWindow()->ShowCursor(visible); |
| 1080 } | 1080 } |
| 1081 | 1081 |
| 1082 } // namespace ash | 1082 } // namespace ash |
| OLD | NEW |