chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 16703025: [StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 16703025: [StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Set storage monitor mock on BrowserProcessImpl directly Created 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc » ('j') | chrome/browser/storage_monitor/storage_monitor.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index e4a99d05c5c190dd8b19a3243866d7f9110db710..b3faf8184f34dca70935f8da6c01eea7dde19d4f 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -84,7 +84,6 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/rlz/rlz.h"

-#include "chrome/browser/storage_monitor/storage_monitor_chromeos.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

@@ -578,8 +577,6 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {

&tracker_);

#endif

- storage_monitor_.reset(new StorageMonitorCros());

// Make sure that wallpaper boot transition and other delays in OOBE

// are disabled for tests and kiosk app launch by default.

// Individual tests may enable them if they want.

@@ -818,7 +815,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {

power_button_observer_.reset();

screensaver_controller_.reset();

idle_action_warning_observer_.reset();

- storage_monitor_.reset();

// Delete ContactManager while |g_browser_process| is still alive.

contact_manager_.reset();