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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/message_loop_proxy.h" 7 #include "base/message_loop_proxy.h"
8 #include "chrome/browser/system_monitor/media_transfer_protocol_device_observer_ linux.h" 8 #include "chrome/browser/system_monitor/media_transfer_protocol_device_observer_ linux.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h" 10 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
11 11
12 #if !defined(OS_CHROMEOS) 12 #if !defined(OS_CHROMEOS)
13 #include "chrome/browser/system_monitor/removable_device_notifications_linux.h" 13 #include "chrome/browser/system_monitor/removable_device_notifications_linux.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #endif 15 #endif
16 16
17 #if defined(USE_LINUX_BREAKPAD) 17 #if defined(USE_LINUX_BREAKPAD)
18 #include <stdlib.h> 18 #include <stdlib.h>
19 19
20 #include "base/command_line.h" 20 #include "base/command_line.h"
21 #include "base/linux_util.h" 21 #include "base/linux_util.h"
22 #include "base/prefs/pref_service.h"
22 #include "chrome/app/breakpad_linux.h" 23 #include "chrome/app/breakpad_linux.h"
23 #include "chrome/browser/prefs/pref_service.h"
24 #include "chrome/common/env_vars.h" 24 #include "chrome/common/env_vars.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 26
27 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
28 #include "chrome/browser/chromeos/settings/cros_settings.h" 28 #include "chrome/browser/chromeos/settings/cros_settings.h"
29 #include "chrome/browser/chromeos/settings/cros_settings_names.h" 29 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
30 #include "chrome/common/chrome_version_info.h" 30 #include "chrome/common/chrome_version_info.h"
31 #endif 31 #endif
32 32
33 #endif // defined(USE_LINUX_BREAKPAD) 33 #endif // defined(USE_LINUX_BREAKPAD)
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 // Release it now. Otherwise the FILE thread would be gone when we try to 168 // Release it now. Otherwise the FILE thread would be gone when we try to
169 // release it in the dtor and Valgrind would report a leak on almost ever 169 // release it in the dtor and Valgrind would report a leak on almost ever
170 // single browser_test. 170 // single browser_test.
171 removable_device_notifications_linux_ = NULL; 171 removable_device_notifications_linux_ = NULL;
172 #endif 172 #endif
173 173
174 media_transfer_protocol_device_observer_.reset(); 174 media_transfer_protocol_device_observer_.reset();
175 175
176 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); 176 ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
177 } 177 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698