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

Side by Side Diff: ash/shell.cc

Issue 16897006: Move message_pump to base/message_loop. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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
« no previous file with comments | « ash/display/display_change_observer_x11.cc ('k') | base/android/base_jni_registrar.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/focus_manager_factory.h" 10 #include "ash/accelerators/focus_manager_factory.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 #include "ash/accelerators/accelerator_filter.h" 106 #include "ash/accelerators/accelerator_filter.h"
107 #include "ash/accelerators/nested_dispatcher_controller.h" 107 #include "ash/accelerators/nested_dispatcher_controller.h"
108 #endif 108 #endif
109 109
110 #if defined(OS_CHROMEOS) && defined(USE_X11) 110 #if defined(OS_CHROMEOS) && defined(USE_X11)
111 #include "ash/ash_constants.h" 111 #include "ash/ash_constants.h"
112 #include "ash/display/display_change_observer_x11.h" 112 #include "ash/display/display_change_observer_x11.h"
113 #include "ash/display/display_error_dialog.h" 113 #include "ash/display/display_error_dialog.h"
114 #include "ash/display/output_configurator_animation.h" 114 #include "ash/display/output_configurator_animation.h"
115 #include "base/chromeos/chromeos_version.h" 115 #include "base/chromeos/chromeos_version.h"
116 #include "base/message_pump_aurax11.h" 116 #include "base/message_loop/message_pump_aurax11.h"
117 #include "chromeos/display/output_configurator.h" 117 #include "chromeos/display/output_configurator.h"
118 #include "content/public/browser/gpu_data_manager.h" 118 #include "content/public/browser/gpu_data_manager.h"
119 #include "content/public/common/content_switches.h" 119 #include "content/public/common/content_switches.h"
120 #include "gpu/config/gpu_feature_type.h" 120 #include "gpu/config/gpu_feature_type.h"
121 #endif // defined(OS_CHROMEOS) 121 #endif // defined(OS_CHROMEOS)
122 122
123 namespace ash { 123 namespace ash {
124 124
125 namespace { 125 namespace {
126 126
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 //////////////////////////////////////////////////////////////////////////////// 956 ////////////////////////////////////////////////////////////////////////////////
957 // Shell, aura::client::ActivationChangeObserver implementation: 957 // Shell, aura::client::ActivationChangeObserver implementation:
958 958
959 void Shell::OnWindowActivated(aura::Window* gained_active, 959 void Shell::OnWindowActivated(aura::Window* gained_active,
960 aura::Window* lost_active) { 960 aura::Window* lost_active) {
961 if (gained_active) 961 if (gained_active)
962 active_root_window_ = gained_active->GetRootWindow(); 962 active_root_window_ = gained_active->GetRootWindow();
963 } 963 }
964 964
965 } // namespace ash 965 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_change_observer_x11.cc ('k') | base/android/base_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698