| 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 #if !defined(OS_CHROMEOS) | 7 #if !defined(OS_CHROMEOS) |
| 8 #include "chrome/browser/media_gallery/removable_device_notifications_linux.h" | 8 #include "chrome/browser/system_monitor/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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 removable_device_notifications_linux_ = NULL; | 120 removable_device_notifications_linux_ = NULL; |
| 121 #endif | 121 #endif |
| 122 | 122 |
| 123 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); | 123 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); |
| 124 } | 124 } |
| OLD | NEW |