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

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

Issue 1451353002: Implement GpuArcVideoService for arc video accelerator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased with new ArcBridgeService; addressed Owen's comments 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 #include "components/arc/arc_service_manager.h" 113 #include "components/arc/arc_service_manager.h"
114 #include "components/browser_sync/common/browser_sync_switches.h" 114 #include "components/browser_sync/common/browser_sync_switches.h"
115 #include "components/device_event_log/device_event_log.h" 115 #include "components/device_event_log/device_event_log.h"
116 #include "components/metrics/metrics_service.h" 116 #include "components/metrics/metrics_service.h"
117 #include "components/ownership/owner_key_util.h" 117 #include "components/ownership/owner_key_util.h"
118 #include "components/session_manager/core/session_manager.h" 118 #include "components/session_manager/core/session_manager.h"
119 #include "components/signin/core/account_id/account_id.h" 119 #include "components/signin/core/account_id/account_id.h"
120 #include "components/user_manager/user.h" 120 #include "components/user_manager/user.h"
121 #include "components/user_manager/user_manager.h" 121 #include "components/user_manager/user_manager.h"
122 #include "components/wallpaper/wallpaper_manager_base.h" 122 #include "components/wallpaper/wallpaper_manager_base.h"
123 #include "content/browser/gpu/gpu_arc_video_service_host.h"
123 #include "content/public/browser/browser_thread.h" 124 #include "content/public/browser/browser_thread.h"
124 #include "content/public/browser/notification_service.h" 125 #include "content/public/browser/notification_service.h"
125 #include "content/public/common/content_switches.h" 126 #include "content/public/common/content_switches.h"
126 #include "content/public/common/main_function_params.h" 127 #include "content/public/common/main_function_params.h"
127 #include "device/bluetooth/bluetooth_adapter_factory.h" 128 #include "device/bluetooth/bluetooth_adapter_factory.h"
128 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 129 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
129 #include "media/audio/sounds/sounds_manager.h" 130 #include "media/audio/sounds/sounds_manager.h"
130 #include "net/base/network_change_notifier.h" 131 #include "net/base/network_change_notifier.h"
131 #include "net/socket/ssl_server_socket.h" 132 #include "net/socket/ssl_server_socket.h"
132 #include "net/url_request/url_request.h" 133 #include "net/url_request/url_request.h"
(...skipping 254 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_service_manager_.reset(new arc::ArcServiceManager()); 393 arc_service_manager_.reset(new arc::ArcServiceManager());
393 arc_service_manager_->arc_bridge_service()->DetectAvailability(); 394 arc_service_manager_->arc_bridge_service()->DetectAvailability();
394 395
395 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); 396 chromeos::ResourceReporter::GetInstance()->StartMonitoring();
396 397
398 gpu_arc_video_service_host_.reset(new content::GpuArcVideoServiceHost(
399 content::BrowserThread::GetMessageLoopProxyForThread(
400 content::BrowserThread::IO)));
401 gpu_arc_video_service_host_->Initialize();
402
397 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 403 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
398 } 404 }
399 405
400 void ChromeBrowserMainPartsChromeos::PreProfileInit() { 406 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
401 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 407 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
402 // -- immediately before Profile creation(). 408 // -- immediately before Profile creation().
403 409
404 // Now that the file thread exists we can record our stats. 410 // Now that the file thread exists we can record our stats.
405 BootTimesRecorder::Get()->RecordChromeMainStats(); 411 BootTimesRecorder::Get()->RecordChromeMainStats();
406 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get()); 412 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get());
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 // Destroy DBus services immediately after threads are stopped. 826 // Destroy DBus services immediately after threads are stopped.
821 dbus_services_.reset(); 827 dbus_services_.reset();
822 828
823 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 829 ChromeBrowserMainPartsLinux::PostDestroyThreads();
824 830
825 // Destroy DeviceSettingsService after g_browser_process. 831 // Destroy DeviceSettingsService after g_browser_process.
826 DeviceSettingsService::Shutdown(); 832 DeviceSettingsService::Shutdown();
827 } 833 }
828 834
829 } // namespace chromeos 835 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698