| 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/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
| 6 | 6 |
| 7 #include "ash/accelerators/accelerator_table.h" | 7 #include "ash/accelerators/accelerator_table.h" |
| 8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/caps_lock_delegate.h" | 9 #include "ash/caps_lock_delegate.h" |
| 10 #include "ash/desktop_background/desktop_background_controller.h" | 10 #include "ash/desktop_background/desktop_background_controller.h" |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 | 171 |
| 172 bool HandlePrintLayerHierarchy() { | 172 bool HandlePrintLayerHierarchy() { |
| 173 aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow(); | 173 aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow(); |
| 174 ui::PrintLayerHierarchy(root_window->layer(), | 174 ui::PrintLayerHierarchy(root_window->layer(), |
| 175 root_window->last_mouse_location()); | 175 root_window->last_mouse_location()); |
| 176 return true; | 176 return true; |
| 177 } | 177 } |
| 178 | 178 |
| 179 void PrintWindowHierarchy(aura::Window* window, int indent) { | 179 void PrintWindowHierarchy(aura::Window* window, int indent) { |
| 180 std::string indent_str(indent, ' '); | 180 std::string indent_str(indent, ' '); |
| 181 VLOG(1) << indent_str << window->name() << " type " << window->type() | 181 DLOG(INFO) << indent_str << window->name() << " type " << window->type() |
| 182 << (ash::wm::IsActiveWindow(window) ? "active" : ""); | 182 << (ash::wm::IsActiveWindow(window) ? "active" : ""); |
| 183 for (size_t i = 0; i < window->children().size(); ++i) | 183 for (size_t i = 0; i < window->children().size(); ++i) |
| 184 PrintWindowHierarchy(window->children()[i], indent + 3); | 184 PrintWindowHierarchy(window->children()[i], indent + 3); |
| 185 } | 185 } |
| 186 | 186 |
| 187 bool HandlePrintWindowHierarchy() { | 187 bool HandlePrintWindowHierarchy() { |
| 188 VLOG(1) << "Window hierarchy:"; | 188 DLOG(INFO) << "Window hierarchy:"; |
| 189 aura::Window* container = ash::Shell::GetInstance()->GetContainer( | 189 aura::Window* container = ash::Shell::GetInstance()->GetContainer( |
| 190 ash::internal::kShellWindowId_DefaultContainer); | 190 ash::internal::kShellWindowId_DefaultContainer); |
| 191 PrintWindowHierarchy(container, 0); | 191 PrintWindowHierarchy(container, 0); |
| 192 return true; | 192 return true; |
| 193 } | 193 } |
| 194 | 194 |
| 195 #endif | 195 #endif // !defined(NDEBUG) |
| 196 | 196 |
| 197 } // namespace | 197 } // namespace |
| 198 | 198 |
| 199 namespace ash { | 199 namespace ash { |
| 200 | 200 |
| 201 //////////////////////////////////////////////////////////////////////////////// | 201 //////////////////////////////////////////////////////////////////////////////// |
| 202 // AcceleratorController, public: | 202 // AcceleratorController, public: |
| 203 | 203 |
| 204 AcceleratorController::AcceleratorController() | 204 AcceleratorController::AcceleratorController() |
| 205 : accelerator_manager_(new ui::AcceleratorManager) { | 205 : accelerator_manager_(new ui::AcceleratorManager) { |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 // Then set this one as active. | 550 // Then set this one as active. |
| 551 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); | 551 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); |
| 552 } | 552 } |
| 553 } | 553 } |
| 554 | 554 |
| 555 bool AcceleratorController::CanHandleAccelerators() const { | 555 bool AcceleratorController::CanHandleAccelerators() const { |
| 556 return true; | 556 return true; |
| 557 } | 557 } |
| 558 | 558 |
| 559 } // namespace ash | 559 } // namespace ash |
| OLD | NEW |