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

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

Issue 1474283002: arc-bridge: Optimized scoped_ptr passing for ArcBridgeService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | 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) 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 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 content::BrowserThread::FILE), 381 content::BrowserThread::FILE),
382 load_oem_statistics); 382 load_oem_statistics);
383 383
384 base::FilePath downloads_directory; 384 base::FilePath downloads_directory;
385 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); 385 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory));
386 386
387 DeviceOAuth2TokenServiceFactory::Initialize(); 387 DeviceOAuth2TokenServiceFactory::Initialize();
388 388
389 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); 389 wake_on_wifi_manager_.reset(new WakeOnWifiManager());
390 390
391 arc_bridge_service_ = 391 arc_bridge_service_ = arc::ArcBridgeService::Create(
392 arc::ArcBridgeService::Create( 392 content::BrowserThread::GetMessageLoopProxyForThread(
393 content::BrowserThread::GetMessageLoopProxyForThread( 393 content::BrowserThread::IO),
394 content::BrowserThread::IO), 394 content::BrowserThread::GetMessageLoopProxyForThread(
395 content::BrowserThread::GetMessageLoopProxyForThread( 395 content::BrowserThread::FILE));
396 content::BrowserThread::FILE))
397 .Pass();
398 arc_bridge_service_->DetectAvailability(); 396 arc_bridge_service_->DetectAvailability();
399 397
400 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 398 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
401 } 399 }
402 400
403 void ChromeBrowserMainPartsChromeos::PreProfileInit() { 401 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
404 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 402 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
405 // -- immediately before Profile creation(). 403 // -- immediately before Profile creation().
406 404
407 // Now that the file thread exists we can record our stats. 405 // Now that the file thread exists we can record our stats.
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 // Destroy DBus services immediately after threads are stopped. 819 // Destroy DBus services immediately after threads are stopped.
822 dbus_services_.reset(); 820 dbus_services_.reset();
823 821
824 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 822 ChromeBrowserMainPartsLinux::PostDestroyThreads();
825 823
826 // Destroy DeviceSettingsService after g_browser_process. 824 // Destroy DeviceSettingsService after g_browser_process.
827 DeviceSettingsService::Shutdown(); 825 DeviceSettingsService::Shutdown();
828 } 826 }
829 827
830 } // namespace chromeos 828 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698