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

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

Issue 10882039: Make the Linux System Monitor implementation track all devices (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CrOS build Created 8 years, 3 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 | Annotate | Revision Log
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/media_gallery/media_device_notifications_linux.h" 8 #include "chrome/browser/media_gallery/removable_device_notifications_linux.h"
9 #endif 9 #endif
10 10
11 #if defined(USE_LINUX_BREAKPAD) 11 #if defined(USE_LINUX_BREAKPAD)
12 #include <stdlib.h> 12 #include <stdlib.h>
13 13
14 #include "base/linux_util.h" 14 #include "base/linux_util.h"
15 #include "chrome/app/breakpad_linux.h" 15 #include "chrome/app/breakpad_linux.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/common/env_vars.h" 17 #include "chrome/common/env_vars.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 FROM_HERE, 97 FROM_HERE,
98 base::Bind(&GetLinuxDistroCallback)); 98 base::Bind(&GetLinuxDistroCallback));
99 #endif 99 #endif
100 100
101 if (IsCrashReportingEnabled(local_state())) 101 if (IsCrashReportingEnabled(local_state()))
102 InitCrashReporter(); 102 InitCrashReporter();
103 #endif 103 #endif
104 104
105 #if !defined(OS_CHROMEOS) 105 #if !defined(OS_CHROMEOS)
106 const FilePath kDefaultMtabPath("/etc/mtab"); 106 const FilePath kDefaultMtabPath("/etc/mtab");
107 media_device_notifications_linux_ = 107 removable_device_notifications_linux_ =
108 new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath); 108 new chrome::RemovableDeviceNotificationsLinux(kDefaultMtabPath);
109 media_device_notifications_linux_->Init(); 109 removable_device_notifications_linux_->Init();
110 #endif 110 #endif
111 111
112 ChromeBrowserMainPartsPosix::PreProfileInit(); 112 ChromeBrowserMainPartsPosix::PreProfileInit();
113 } 113 }
114 114
115 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { 115 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
116 #if !defined(OS_CHROMEOS) 116 #if !defined(OS_CHROMEOS)
117 // Release it now. Otherwise the FILE thread would be gone when we try to 117 // Release it now. Otherwise the FILE thread would be gone when we try to
118 // release it in the dtor and Valgrind would report a leak on almost ever 118 // release it in the dtor and Valgrind would report a leak on almost ever
119 // single browser_test. 119 // single browser_test.
120 media_device_notifications_linux_ = NULL; 120 removable_device_notifications_linux_ = NULL;
121 #endif 121 #endif
122 122
123 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); 123 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
124 } 124 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_linux.h ('k') | chrome/browser/media_gallery/media_storage_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698