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

Side by Side Diff: ash/accelerators/accelerator_controller.cc

Issue 10444014: ash: Improved window maximize/restore animations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix workspace mgr, remove ignore_window, cleanup Created 8 years, 6 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
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/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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 165
166 bool HandlePrintLayerHierarchy() { 166 bool HandlePrintLayerHierarchy() {
167 aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow(); 167 aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
168 ui::PrintLayerHierarchy(root_window->layer(), 168 ui::PrintLayerHierarchy(root_window->layer(),
169 root_window->last_mouse_location()); 169 root_window->last_mouse_location());
170 return true; 170 return true;
171 } 171 }
172 172
173 void PrintWindowHierarchy(aura::Window* window, int indent) { 173 void PrintWindowHierarchy(aura::Window* window, int indent) {
174 std::string indent_str(indent, ' '); 174 std::string indent_str(indent, ' ');
175 VLOG(1) << indent_str << window->name() << " type " << window->type() 175 DLOG(INFO) << indent_str << window->name() << " type " << window->type()
James Cook 2012/05/29 22:04:40 I often forget to run with --v=1 and this code is
Ben Goodger (Google) 2012/05/29 22:30:45 Seems fine.
176 << (ash::wm::IsActiveWindow(window) ? "active" : ""); 176 << (ash::wm::IsActiveWindow(window) ? "active" : "");
177 for (size_t i = 0; i < window->children().size(); ++i) 177 for (size_t i = 0; i < window->children().size(); ++i)
178 PrintWindowHierarchy(window->children()[i], indent + 3); 178 PrintWindowHierarchy(window->children()[i], indent + 3);
179 } 179 }
180 180
181 bool HandlePrintWindowHierarchy() { 181 bool HandlePrintWindowHierarchy() {
182 VLOG(1) << "Window hierarchy:"; 182 DLOG(INFO) << "Window hierarchy:";
183 aura::Window* container = ash::Shell::GetInstance()->GetContainer( 183 aura::Window* container = ash::Shell::GetInstance()->GetContainer(
184 ash::internal::kShellWindowId_DefaultContainer); 184 ash::internal::kShellWindowId_DefaultContainer);
185 PrintWindowHierarchy(container, 0); 185 PrintWindowHierarchy(container, 0);
186 return true; 186 return true;
187 } 187 }
188 188
189 #endif 189 #endif // !defined(NDEBUG)
190 190
191 } // namespace 191 } // namespace
192 192
193 namespace ash { 193 namespace ash {
194 194
195 //////////////////////////////////////////////////////////////////////////////// 195 ////////////////////////////////////////////////////////////////////////////////
196 // AcceleratorController, public: 196 // AcceleratorController, public:
197 197
198 AcceleratorController::AcceleratorController() 198 AcceleratorController::AcceleratorController()
199 : accelerator_manager_(new ui::AcceleratorManager) { 199 : accelerator_manager_(new ui::AcceleratorManager) {
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 // Then set this one as active. 534 // Then set this one as active.
535 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); 535 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
536 } 536 }
537 } 537 }
538 538
539 bool AcceleratorController::CanHandleAccelerators() const { 539 bool AcceleratorController::CanHandleAccelerators() const {
540 return true; 540 return true;
541 } 541 }
542 542
543 } // namespace ash 543 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/wm/base_layout_manager.h » ('j') | chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698