diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-31 18:55:14 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-31 18:55:14 +0000 |
| commit | 6876147020f06c3c9bb5305dd683e0e71f26382e (patch) | |
| tree | 7c205068f37f9f00a52f8de6629b29b0da8a3da5 /chrome/browser/prefs | |
| parent | f524ff66115a0ede86db4e8fc966aaa0ae241a9e (diff) | |
| download | chromium_src-6876147020f06c3c9bb5305dd683e0e71f26382e.zip chromium_src-6876147020f06c3c9bb5305dd683e0e71f26382e.tar.gz chromium_src-6876147020f06c3c9bb5305dd683e0e71f26382e.tar.bz2 | |
TabContentsWrapper cleanup.
BUG=94811
TEST=no visible change
Review URL: http://codereview.chromium.org/7810006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 2381332..b64f8f5 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -42,7 +42,7 @@ #include "chrome/browser/profiles/profile_impl.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/remoting/firewall_traversal_tab_helper.h" +#include "chrome/browser/remoting/firewall_traversal_observer.h" #include "chrome/browser/renderer_host/web_cache_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/search_engines/template_url_service.h" @@ -179,7 +179,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { InstantController::RegisterUserPrefs(user_prefs); NetPrefObserver::RegisterPrefs(user_prefs); ProtocolHandlerRegistry::RegisterPrefs(user_prefs); - FirewallTraversalTabHelper::RegisterUserPrefs(user_prefs); + FirewallTraversalObserver::RegisterUserPrefs(user_prefs); #if defined(OS_MACOSX) PresentationModePrefs::RegisterUserPrefs(user_prefs); #endif |