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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser.h" 5 #include "chrome/browser/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "chrome/browser/first_run/first_run.h" 53 #include "chrome/browser/first_run/first_run.h"
54 #include "chrome/browser/google_url_tracker.h" 54 #include "chrome/browser/google_url_tracker.h"
55 #include "chrome/browser/google_util.h" 55 #include "chrome/browser/google_util.h"
56 #include "chrome/browser/host_zoom_map.h" 56 #include "chrome/browser/host_zoom_map.h"
57 #include "chrome/browser/location_bar.h" 57 #include "chrome/browser/location_bar.h"
58 #include "chrome/browser/metrics/user_metrics.h" 58 #include "chrome/browser/metrics/user_metrics.h"
59 #include "chrome/browser/net/browser_url_util.h" 59 #include "chrome/browser/net/browser_url_util.h"
60 #include "chrome/browser/net/url_fixer_upper.h" 60 #include "chrome/browser/net/url_fixer_upper.h"
61 #include "chrome/browser/options_window.h" 61 #include "chrome/browser/options_window.h"
62 #include "chrome/browser/platform_util.h" 62 #include "chrome/browser/platform_util.h"
63 #include "chrome/browser/pref_service.h" 63 #include "chrome/browser/prefs/pref_service.h"
64 #include "chrome/browser/profile.h" 64 #include "chrome/browser/profile.h"
65 #if defined(ENABLE_REMOTING) 65 #if defined(ENABLE_REMOTING)
66 #include "chrome/browser/remoting/remoting_setup_flow.h" 66 #include "chrome/browser/remoting/remoting_setup_flow.h"
67 #endif 67 #endif
68 #include "chrome/browser/renderer_host/render_view_host.h" 68 #include "chrome/browser/renderer_host/render_view_host.h"
69 #include "chrome/browser/renderer_host/site_instance.h" 69 #include "chrome/browser/renderer_host/site_instance.h"
70 #include "chrome/browser/service/service_process_control_manager.h" 70 #include "chrome/browser/service/service_process_control_manager.h"
71 #include "chrome/browser/sessions/session_service.h" 71 #include "chrome/browser/sessions/session_service.h"
72 #include "chrome/browser/sessions/session_types.h" 72 #include "chrome/browser/sessions/session_types.h"
73 #include "chrome/browser/status_bubble.h" 73 #include "chrome/browser/status_bubble.h"
(...skipping 3944 matching lines...) Expand 10 before | Expand all | Expand 10 after
4018 } 4018 }
4019 4019
4020 void Browser::TabRestoreServiceDestroyed(TabRestoreService* service) { 4020 void Browser::TabRestoreServiceDestroyed(TabRestoreService* service) {
4021 if (!tab_restore_service_) 4021 if (!tab_restore_service_)
4022 return; 4022 return;
4023 4023
4024 DCHECK_EQ(tab_restore_service_, service); 4024 DCHECK_EQ(tab_restore_service_, service);
4025 tab_restore_service_->RemoveObserver(this); 4025 tab_restore_service_->RemoveObserver(this);
4026 tab_restore_service_ = NULL; 4026 tab_restore_service_ = NULL;
4027 } 4027 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698