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

Side by Side Diff: ash/wm/session_state_controller_impl2.cc

Issue 11275139: Move ui\aura\shared to ui\views\corewm (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/wm/session_state_controller_impl2.h" 5 #include "ash/wm/session_state_controller_impl2.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_delegate.h" 9 #include "ash/shell_delegate.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
11 #include "ash/wm/session_state_animator.h" 11 #include "ash/wm/session_state_animator.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "ui/aura/root_window.h" 14 #include "ui/aura/root_window.h"
15 #include "ui/aura/shared/compound_event_filter.h" 15 #include "ui/views/corewm/compound_event_filter.h"
16 16
17 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
18 #include "base/chromeos/chromeos_version.h" 18 #include "base/chromeos/chromeos_version.h"
19 #endif 19 #endif
20 20
21 namespace ash { 21 namespace ash {
22 22
23 SessionStateControllerImpl2::TestApi::TestApi( 23 SessionStateControllerImpl2::TestApi::TestApi(
24 SessionStateControllerImpl2* controller) 24 SessionStateControllerImpl2* controller)
25 : controller_(controller) { 25 : controller_(controller) {
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 callback); 327 callback);
328 } else { 328 } else {
329 animator_->StartAnimationWithCallback( 329 animator_->StartAnimationWithCallback(
330 internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, 330 internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
331 internal::SessionStateAnimator::ANIMATION_LOWER_BELOW_SCREEN, 331 internal::SessionStateAnimator::ANIMATION_LOWER_BELOW_SCREEN,
332 callback); 332 callback);
333 } 333 }
334 } 334 }
335 335
336 } // namespace ash 336 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/session_state_controller_impl.cc ('k') | ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698