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

Side by Side Diff: ash/shell.cc

Issue 29883002: Attempt to re-land FocusManager removal from Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable test with note. Created 7 years, 2 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
« no previous file with comments | « no previous file | ash/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "ash/wm/window_properties.h" 76 #include "ash/wm/window_properties.h"
77 #include "ash/wm/window_util.h" 77 #include "ash/wm/window_util.h"
78 #include "ash/wm/workspace_controller.h" 78 #include "ash/wm/workspace_controller.h"
79 #include "base/bind.h" 79 #include "base/bind.h"
80 #include "base/command_line.h" 80 #include "base/command_line.h"
81 #include "base/debug/leak_annotations.h" 81 #include "base/debug/leak_annotations.h"
82 #include "base/debug/trace_event.h" 82 #include "base/debug/trace_event.h"
83 #include "ui/aura/client/aura_constants.h" 83 #include "ui/aura/client/aura_constants.h"
84 #include "ui/aura/client/user_action_client.h" 84 #include "ui/aura/client/user_action_client.h"
85 #include "ui/aura/env.h" 85 #include "ui/aura/env.h"
86 #include "ui/aura/focus_manager.h"
87 #include "ui/aura/layout_manager.h" 86 #include "ui/aura/layout_manager.h"
88 #include "ui/aura/root_window.h" 87 #include "ui/aura/root_window.h"
89 #include "ui/aura/window.h" 88 #include "ui/aura/window.h"
90 #include "ui/base/ui_base_switches.h" 89 #include "ui/base/ui_base_switches.h"
91 #include "ui/compositor/layer.h" 90 #include "ui/compositor/layer.h"
92 #include "ui/compositor/layer_animator.h" 91 #include "ui/compositor/layer_animator.h"
93 #include "ui/gfx/display.h" 92 #include "ui/gfx/display.h"
94 #include "ui/gfx/image/image_skia.h" 93 #include "ui/gfx/image/image_skia.h"
95 #include "ui/gfx/screen.h" 94 #include "ui/gfx/screen.h"
96 #include "ui/gfx/size.h" 95 #include "ui/gfx/size.h"
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 //////////////////////////////////////////////////////////////////////////////// 975 ////////////////////////////////////////////////////////////////////////////////
977 // Shell, aura::client::ActivationChangeObserver implementation: 976 // Shell, aura::client::ActivationChangeObserver implementation:
978 977
979 void Shell::OnWindowActivated(aura::Window* gained_active, 978 void Shell::OnWindowActivated(aura::Window* gained_active,
980 aura::Window* lost_active) { 979 aura::Window* lost_active) {
981 if (gained_active) 980 if (gained_active)
982 target_root_window_ = gained_active->GetRootWindow(); 981 target_root_window_ = gained_active->GetRootWindow();
983 } 982 }
984 983
985 } // namespace ash 984 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698