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

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

Issue 3296003: FBTF: Move the TabRestoreService::Observer into its own file. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: More mac fixes 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
« no previous file with comments | « chrome/browser/browser.h ('k') | chrome/browser/cocoa/history_menu_bridge.h » ('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) 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "chrome/browser/prefs/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/sessions/tab_restore_service.h"
73 #include "chrome/browser/status_bubble.h" 74 #include "chrome/browser/status_bubble.h"
74 #include "chrome/browser/sync/profile_sync_service.h" 75 #include "chrome/browser/sync/profile_sync_service.h"
75 #include "chrome/browser/sync/sync_ui_util.h" 76 #include "chrome/browser/sync/sync_ui_util.h"
76 #include "chrome/browser/tab_closeable_state_watcher.h" 77 #include "chrome/browser/tab_closeable_state_watcher.h"
77 #include "chrome/browser/tab_contents/interstitial_page.h" 78 #include "chrome/browser/tab_contents/interstitial_page.h"
78 #include "chrome/browser/tab_contents/match_preview.h" 79 #include "chrome/browser/tab_contents/match_preview.h"
79 #include "chrome/browser/tab_contents/navigation_controller.h" 80 #include "chrome/browser/tab_contents/navigation_controller.h"
80 #include "chrome/browser/tab_contents/navigation_entry.h" 81 #include "chrome/browser/tab_contents/navigation_entry.h"
81 #include "chrome/browser/tab_contents/tab_contents.h" 82 #include "chrome/browser/tab_contents/tab_contents.h"
82 #include "chrome/browser/tab_contents/tab_contents_view.h" 83 #include "chrome/browser/tab_contents/tab_contents_view.h"
(...skipping 3939 matching lines...) Expand 10 before | Expand all | Expand 10 after
4022 } 4023 }
4023 4024
4024 void Browser::TabRestoreServiceDestroyed(TabRestoreService* service) { 4025 void Browser::TabRestoreServiceDestroyed(TabRestoreService* service) {
4025 if (!tab_restore_service_) 4026 if (!tab_restore_service_)
4026 return; 4027 return;
4027 4028
4028 DCHECK_EQ(tab_restore_service_, service); 4029 DCHECK_EQ(tab_restore_service_, service);
4029 tab_restore_service_->RemoveObserver(this); 4030 tab_restore_service_->RemoveObserver(this);
4030 tab_restore_service_ = NULL; 4031 tab_restore_service_ = NULL;
4031 } 4032 }
OLDNEW
« no previous file with comments | « chrome/browser/browser.h ('k') | chrome/browser/cocoa/history_menu_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698