| OLD | NEW |
| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 // Needs to be called after we have chrome::DIR_USER_DATA and | 77 // Needs to be called after we have chrome::DIR_USER_DATA and |
| 76 // g_browser_process. This happens in PreCreateThreads. | 78 // g_browser_process. This happens in PreCreateThreads. |
| 77 content::BrowserThread::PostTask(content::BrowserThread::FILE, | 79 content::BrowserThread::PostTask(content::BrowserThread::FILE, |
| 78 FROM_HERE, | 80 FROM_HERE, |
| 79 base::Bind(&GetLinuxDistroCallback)); | 81 base::Bind(&GetLinuxDistroCallback)); |
| 80 | 82 |
| 81 if (IsCrashReportingEnabled(local_state())) | 83 if (IsCrashReportingEnabled(local_state())) |
| 82 InitCrashReporter(); | 84 InitCrashReporter(); |
| 83 #endif | 85 #endif |
| 84 | 86 |
| 87 const FilePath kDefaultMtabPath("/etc/mtab"); |
| 88 media_device_notifications_linux_ = |
| 89 new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath); |
| 90 media_device_notifications_linux_->Init(); |
| 91 |
| 85 ChromeBrowserMainPartsPosix::PreProfileInit(); | 92 ChromeBrowserMainPartsPosix::PreProfileInit(); |
| 86 } | 93 } |
| OLD | NEW |