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

Side by Side Diff: ash/shell.cc

Issue 1992443002: Add Mojo IPC based input-device service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_ddm
Patch Set: Rebase/move. Created 4 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
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 #include <utility> 9 #include <utility>
10 10
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 #if defined(OS_CHROMEOS) 1101 #if defined(OS_CHROMEOS)
1102 // Create the LogoutConfirmationController after the SystemTrayDelegate. 1102 // Create the LogoutConfirmationController after the SystemTrayDelegate.
1103 logout_confirmation_controller_.reset(new LogoutConfirmationController( 1103 logout_confirmation_controller_.reset(new LogoutConfirmationController(
1104 base::Bind(&SystemTrayDelegate::SignOut, 1104 base::Bind(&SystemTrayDelegate::SignOut,
1105 base::Unretained(system_tray_delegate_.get())))); 1105 base::Unretained(system_tray_delegate_.get()))));
1106 1106
1107 // Create TouchTransformerController before 1107 // Create TouchTransformerController before
1108 // WindowTreeHostManager::InitDisplays() 1108 // WindowTreeHostManager::InitDisplays()
1109 // since TouchTransformerController listens on 1109 // since TouchTransformerController listens on
1110 // WindowTreeHostManager::Observer::OnDisplaysInitialized(). 1110 // WindowTreeHostManager::Observer::OnDisplaysInitialized().
1111 touch_transformer_controller_.reset(new TouchTransformerController()); 1111 if (!in_mus_)
1112 touch_transformer_controller_.reset(new TouchTransformerController());
1112 #endif // defined(OS_CHROMEOS) 1113 #endif // defined(OS_CHROMEOS)
1113 1114
1114 keyboard_ui_ = init_params.keyboard_factory.is_null() 1115 keyboard_ui_ = init_params.keyboard_factory.is_null()
1115 ? KeyboardUI::Create() 1116 ? KeyboardUI::Create()
1116 : init_params.keyboard_factory.Run(); 1117 : init_params.keyboard_factory.Run();
1117 1118
1118 window_tree_host_manager_->InitHosts(); 1119 window_tree_host_manager_->InitHosts();
1119 1120
1120 #if defined(OS_CHROMEOS) 1121 #if defined(OS_CHROMEOS)
1121 // Needs to be created after InitDisplays() since it may cause the virtual 1122 // Needs to be created after InitDisplays() since it may cause the virtual
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
1249 1250
1250 void Shell::OnWindowActivated( 1251 void Shell::OnWindowActivated(
1251 aura::client::ActivationChangeObserver::ActivationReason reason, 1252 aura::client::ActivationChangeObserver::ActivationReason reason,
1252 aura::Window* gained_active, 1253 aura::Window* gained_active,
1253 aura::Window* lost_active) { 1254 aura::Window* lost_active) {
1254 if (gained_active) 1255 if (gained_active)
1255 target_root_window_ = gained_active->GetRootWindow(); 1256 target_root_window_ = gained_active->GetRootWindow();
1256 } 1257 }
1257 1258
1258 } // namespace ash 1259 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/sysui/manifest.json » ('j') | components/mus/public/cpp/input_devices/lib/input_device_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698