diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 13:53:40 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 13:53:40 +0000 |
commit | 165ccdc46caec352f113695066d4a0ad917c9860 (patch) | |
tree | 9fca98b5e79879a0c7649e28299668064a3a2777 /chrome | |
parent | b62b28a6f6948e705284507c82926ef1a06d191b (diff) | |
download | chromium_src-165ccdc46caec352f113695066d4a0ad917c9860.zip chromium_src-165ccdc46caec352f113695066d4a0ad917c9860.tar.gz chromium_src-165ccdc46caec352f113695066d4a0ad917c9860.tar.bz2 |
Fix naming.
The DevTools class is an Observer, not a TabHelper, since it doesn't provide API but just sits there quietly.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6792001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
4 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/debugger/devtools_handler.cc b/chrome/browser/debugger/devtools_handler.cc index 574ef51..e7f2caf 100644 --- a/chrome/browser/debugger/devtools_handler.cc +++ b/chrome/browser/debugger/devtools_handler.cc @@ -70,11 +70,11 @@ RenderViewHost* DevToolsHandler::GetRenderViewHost() { } -DevToolsTabHelper::DevToolsTabHelper(TabContents* tab_contents) +DevToolsObserver::DevToolsObserver(TabContents* tab_contents) : TabContentsObserver(tab_contents), handler_(tab_contents, NULL) { } -bool DevToolsTabHelper::OnMessageReceived(const IPC::Message& message) { +bool DevToolsObserver::OnMessageReceived(const IPC::Message& message) { return handler_.OnMessageReceived(message); } diff --git a/chrome/browser/debugger/devtools_handler.h b/chrome/browser/debugger/devtools_handler.h index 424edd1..5ce9024 100644 --- a/chrome/browser/debugger/devtools_handler.h +++ b/chrome/browser/debugger/devtools_handler.h @@ -38,9 +38,9 @@ class DevToolsHandler { }; // A wrapper around DevToolsHandler that implements TabContentsObserver. -class DevToolsTabHelper : public TabContentsObserver { +class DevToolsObserver : public TabContentsObserver { public: - explicit DevToolsTabHelper(TabContents* tab_contents); + explicit DevToolsObserver(TabContents* tab_contents); // TabContentsObserver implementation. virtual bool OnMessageReceived(const IPC::Message& message); @@ -48,7 +48,7 @@ class DevToolsTabHelper : public TabContentsObserver { private: DevToolsHandler handler_; - DISALLOW_COPY_AND_ASSIGN(DevToolsTabHelper); + DISALLOW_COPY_AND_ASSIGN(DevToolsObserver); }; #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_HANDLER_H_ diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc index 39789b6..1a27f92 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc @@ -53,7 +53,6 @@ TabContentsWrapper::TabContentsWrapper(TabContents* contents) // Create the tab helpers. autocomplete_history_manager_.reset(new AutocompleteHistoryManager(contents)); autofill_manager_.reset(new AutofillManager(contents)); - dev_tools_tab_helper_.reset(new DevToolsTabHelper(contents)); find_tab_helper_.reset(new FindTabHelper(contents)); password_manager_delegate_.reset(new PasswordManagerDelegateImpl(contents)); password_manager_.reset( @@ -67,6 +66,7 @@ TabContentsWrapper::TabContentsWrapper(TabContents* contents) NotificationService::AllSources()); // Create the per-tab observers. + dev_tools_observer_.reset(new DevToolsObserver(contents)); file_select_observer_.reset(new FileSelectObserver(contents)); prerender_observer_.reset(new prerender::PrerenderObserver(contents)); printing_.reset(new printing::PrintViewManager(contents)); diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h index 21cd0c0..3a45f87 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h @@ -26,7 +26,7 @@ class PrintViewManager; class AutocompleteHistoryManager; class AutofillManager; -class DevToolsTabHelper; +class DevToolsObserver; class Extension; class FileSelectObserver; class FindTabHelper; @@ -171,8 +171,6 @@ class TabContentsWrapper : public NotificationObserver, scoped_ptr<AutofillManager> autofill_manager_; - scoped_ptr<DevToolsTabHelper> dev_tools_tab_helper_; - scoped_ptr<FindTabHelper> find_tab_helper_; // PasswordManager and its delegate. The delegate must outlive the manager, @@ -186,6 +184,7 @@ class TabContentsWrapper : public NotificationObserver, // (These provide no API for callers; objects that need to exist 1:1 with tabs // and silently do their thing live here.) + scoped_ptr<DevToolsObserver> dev_tools_observer_; scoped_ptr<FileSelectObserver> file_select_observer_; scoped_ptr<prerender::PrerenderObserver> prerender_observer_; |