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

Side by Side Diff: chrome/browser/chrome_browser_main_linux.cc

Issue 14556015: [Media Galleries] Lazily initialize the storage monitor. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix merge 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_browser_main_linux.h" 5 #include "chrome/browser/chrome_browser_main_linux.h"
6 6
7 #if !defined(OS_CHROMEOS) 7 #if !defined(OS_CHROMEOS)
8 #include "chrome/browser/storage_monitor/storage_monitor_linux.h" 8 #include "chrome/browser/storage_monitor/storage_monitor_linux.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #endif 10 #endif
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 #endif 126 #endif
127 127
128 #if !defined(OS_CHROMEOS) 128 #if !defined(OS_CHROMEOS)
129 const base::FilePath kDefaultMtabPath("/etc/mtab"); 129 const base::FilePath kDefaultMtabPath("/etc/mtab");
130 storage_monitor_.reset(new chrome::StorageMonitorLinux(kDefaultMtabPath)); 130 storage_monitor_.reset(new chrome::StorageMonitorLinux(kDefaultMtabPath));
131 #endif 131 #endif
132 132
133 ChromeBrowserMainPartsPosix::PreProfileInit(); 133 ChromeBrowserMainPartsPosix::PreProfileInit();
134 } 134 }
135 135
136 void ChromeBrowserMainPartsLinux::PostProfileInit() {
137 #if !defined(OS_CHROMEOS)
138 storage_monitor_->Init();
139 #endif
140
141 ChromeBrowserMainPartsPosix::PostProfileInit();
142 }
143
144 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { 136 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
145 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); 137 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
146 138
147 #if !defined(OS_CHROMEOS) 139 #if !defined(OS_CHROMEOS)
148 // Delete it now. Otherwise the FILE thread would be gone when we try to 140 // Delete it now. Otherwise the FILE thread would be gone when we try to
149 // release it in the dtor and Valgrind would report a leak on almost every 141 // release it in the dtor and Valgrind would report a leak on almost every
150 // single browser_test. 142 // single browser_test.
151 storage_monitor_.reset(); 143 storage_monitor_.reset();
152 #endif 144 #endif
153 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698