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

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

Issue 10069007: Media Gallery: Move MediaDeviceNotificationsLinux from content to chrome. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: clang Created 8 years, 8 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 #include "chrome/browser/media_gallery/media_device_notifications_linux.h"
8
7 #if defined(USE_LINUX_BREAKPAD) 9 #if defined(USE_LINUX_BREAKPAD)
8 #include <stdlib.h> 10 #include <stdlib.h>
9 11
10 #include "base/linux_util.h" 12 #include "base/linux_util.h"
11 #include "chrome/app/breakpad_linuxish.h" 13 #include "chrome/app/breakpad_linuxish.h"
12 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/common/env_vars.h" 15 #include "chrome/common/env_vars.h"
14 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
15 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
16 18
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 65 }
64 #endif // defined(USE_LINUX_BREAKPAD) 66 #endif // defined(USE_LINUX_BREAKPAD)
65 67
66 } // namespace 68 } // namespace
67 69
68 ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux( 70 ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux(
69 const content::MainFunctionParams& parameters) 71 const content::MainFunctionParams& parameters)
70 : ChromeBrowserMainPartsPosix(parameters) { 72 : ChromeBrowserMainPartsPosix(parameters) {
71 } 73 }
72 74
75 ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() {
76 }
77
73 void ChromeBrowserMainPartsLinux::PreProfileInit() { 78 void ChromeBrowserMainPartsLinux::PreProfileInit() {
74 #if defined(USE_LINUX_BREAKPAD) 79 #if defined(USE_LINUX_BREAKPAD)
75 // Needs to be called after we have chrome::DIR_USER_DATA and 80 // Needs to be called after we have chrome::DIR_USER_DATA and
76 // g_browser_process. This happens in PreCreateThreads. 81 // g_browser_process. This happens in PreCreateThreads.
77 content::BrowserThread::PostTask(content::BrowserThread::FILE, 82 content::BrowserThread::PostTask(content::BrowserThread::FILE,
78 FROM_HERE, 83 FROM_HERE,
79 base::Bind(&GetLinuxDistroCallback)); 84 base::Bind(&GetLinuxDistroCallback));
80 85
81 if (IsCrashReportingEnabled(local_state())) 86 if (IsCrashReportingEnabled(local_state()))
82 InitCrashReporter(); 87 InitCrashReporter();
83 #endif 88 #endif
84 89
90 const FilePath kDefaultMtabPath("/etc/mtab");
91 media_device_notifications_linux_ =
92 new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath);
93 media_device_notifications_linux_->Init();
94
85 ChromeBrowserMainPartsPosix::PreProfileInit(); 95 ChromeBrowserMainPartsPosix::PreProfileInit();
86 } 96 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_linux.h ('k') | chrome/browser/media_gallery/media_device_notifications_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698