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

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: fixed scopedfd Created 5 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
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 139
140 // Exclude X11 dependents for ozone 140 // Exclude X11 dependents for ozone
141 #if defined(USE_X11) 141 #if defined(USE_X11)
142 #include "chrome/browser/chromeos/device_uma.h" 142 #include "chrome/browser/chromeos/device_uma.h"
143 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 143 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
144 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h" 144 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h"
145 #endif 145 #endif
146 146
147 #if defined(ENABLE_ARC) 147 #if defined(ENABLE_ARC)
148 #include "components/arc/arc_bridge_service.h" 148 #include "components/arc/arc_bridge_service.h"
149 #include "components/exo/arc/arc_input_bridge.h"
149 #endif 150 #endif
150 151
151 namespace chromeos { 152 namespace chromeos {
152 153
153 namespace { 154 namespace {
154 155
155 void ChromeOSVersionCallback(const std::string& version) { 156 void ChromeOSVersionCallback(const std::string& version) {
156 base::SetLinuxDistro(std::string("CrOS ") + version); 157 base::SetLinuxDistro(std::string("CrOS ") + version);
157 } 158 }
158 159
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 DeviceOAuth2TokenServiceFactory::Initialize(); 390 DeviceOAuth2TokenServiceFactory::Initialize();
390 391
391 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); 392 wake_on_wifi_manager_.reset(new WakeOnWifiManager());
392 393
393 #if defined(ENABLE_ARC) 394 #if defined(ENABLE_ARC)
394 arc_bridge_service_.reset(new arc::ArcBridgeService( 395 arc_bridge_service_.reset(new arc::ArcBridgeService(
395 content::BrowserThread::GetMessageLoopProxyForThread( 396 content::BrowserThread::GetMessageLoopProxyForThread(
396 content::BrowserThread::IO), 397 content::BrowserThread::IO),
397 content::BrowserThread::GetMessageLoopProxyForThread( 398 content::BrowserThread::GetMessageLoopProxyForThread(
398 content::BrowserThread::FILE))); 399 content::BrowserThread::FILE)));
400 arc_input_bridge_.reset(
401 new arc::ArcInputBridge(arc_bridge_service_->AsWeakPtr()));
399 arc_bridge_service_->DetectAvailability(); 402 arc_bridge_service_->DetectAvailability();
400 #endif 403 #endif
401 404
402 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 405 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
403 } 406 }
404 407
405 void ChromeBrowserMainPartsChromeos::PreProfileInit() { 408 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
406 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 409 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
407 // -- immediately before Profile creation(). 410 // -- immediately before Profile creation().
408 411
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 // Destroy DBus services immediately after threads are stopped. 828 // Destroy DBus services immediately after threads are stopped.
826 dbus_services_.reset(); 829 dbus_services_.reset();
827 830
828 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 831 ChromeBrowserMainPartsLinux::PostDestroyThreads();
829 832
830 // Destroy DeviceSettingsService after g_browser_process. 833 // Destroy DeviceSettingsService after g_browser_process.
831 DeviceSettingsService::Shutdown(); 834 DeviceSettingsService::Shutdown();
832 } 835 }
833 836
834 } // namespace chromeos 837 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698