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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1408263006: chromeos: Add ArcInputBridge to components/arc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@arcxx
Patch Set: Moved code back to components/arc Created 5 years 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 #endif 139 #endif
140 140
141 // Exclude X11 dependents for ozone 141 // Exclude X11 dependents for ozone
142 #if defined(USE_X11) 142 #if defined(USE_X11)
143 #include "chrome/browser/chromeos/device_uma.h" 143 #include "chrome/browser/chromeos/device_uma.h"
144 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 144 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
145 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h" 145 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h"
146 #endif 146 #endif
147 147
148 #include "components/arc/arc_bridge_service.h" 148 #include "components/arc/arc_bridge_service.h"
149 #include "components/arc/input/arc_input_bridge.h"
149 150
150 namespace chromeos { 151 namespace chromeos {
151 152
152 namespace { 153 namespace {
153 154
154 void ChromeOSVersionCallback(const std::string& version) { 155 void ChromeOSVersionCallback(const std::string& version) {
155 base::SetLinuxDistro(std::string("CrOS ") + version); 156 base::SetLinuxDistro(std::string("CrOS ") + version);
156 } 157 }
157 158
158 bool ShouldAutoLaunchKioskApp(const base::CommandLine& command_line) { 159 bool ShouldAutoLaunchKioskApp(const base::CommandLine& command_line) {
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 388
388 DeviceOAuth2TokenServiceFactory::Initialize(); 389 DeviceOAuth2TokenServiceFactory::Initialize();
389 390
390 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); 391 wake_on_wifi_manager_.reset(new WakeOnWifiManager());
391 392
392 arc_bridge_service_ = arc::ArcBridgeService::Create( 393 arc_bridge_service_ = arc::ArcBridgeService::Create(
393 content::BrowserThread::GetMessageLoopProxyForThread( 394 content::BrowserThread::GetMessageLoopProxyForThread(
394 content::BrowserThread::IO), 395 content::BrowserThread::IO),
395 content::BrowserThread::GetMessageLoopProxyForThread( 396 content::BrowserThread::GetMessageLoopProxyForThread(
396 content::BrowserThread::FILE)); 397 content::BrowserThread::FILE));
398 arc_input_bridge_.reset(
399 new arc::ArcInputBridge(arc_bridge_service_->AsWeakPtr()));
397 arc_bridge_service_->DetectAvailability(); 400 arc_bridge_service_->DetectAvailability();
398 401
399 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); 402 chromeos::ResourceReporter::GetInstance()->StartMonitoring();
400 403
401 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 404 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
402 } 405 }
403 406
404 void ChromeBrowserMainPartsChromeos::PreProfileInit() { 407 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
405 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 408 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
406 // -- immediately before Profile creation(). 409 // -- immediately before Profile creation().
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 // Destroy DBus services immediately after threads are stopped. 827 // Destroy DBus services immediately after threads are stopped.
825 dbus_services_.reset(); 828 dbus_services_.reset();
826 829
827 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 830 ChromeBrowserMainPartsLinux::PostDestroyThreads();
828 831
829 // Destroy DeviceSettingsService after g_browser_process. 832 // Destroy DeviceSettingsService after g_browser_process.
830 DeviceSettingsService::Shutdown(); 833 DeviceSettingsService::Shutdown();
831 } 834 }
832 835
833 } // namespace chromeos 836 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698