summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation/automation_provider.h
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-28 22:24:54 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-28 22:24:54 +0000
commitcdc052d69c06e646a309b0f2e91cd0292a8daca5 (patch)
treef5cd29bc38f780b38689c3438eaf0178cced5719 /chrome/browser/automation/automation_provider.h
parenta7668a1bbb5f73d631f24c2dac7ae16ab7a43433 (diff)
downloadchromium_src-cdc052d69c06e646a309b0f2e91cd0292a8daca5.zip
chromium_src-cdc052d69c06e646a309b0f2e91cd0292a8daca5.tar.gz
chromium_src-cdc052d69c06e646a309b0f2e91cd0292a8daca5.tar.bz2
RefCounted types should not have public destructors
Change content::ContentBrowserClient and content::NotificationObserver to have protected destructors, as their lifetimes are not managed by code within the content/ code. Update the few affected callsites to use the most-derived classes, which have public destructors and for which the callers manage the lifetime of. BUG=123295 TEST=existing Review URL: https://chromiumcodereview.appspot.com/10413027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_provider.h')
-rw-r--r--chrome/browser/automation/automation_provider.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 5aacaac..cffefe9 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -45,10 +45,12 @@ class AutomationWindowTracker;
class Browser;
class ExternalTabContainer;
class FilePath;
+class FindInPageNotificationObserver;
class InitialLoadObserver;
class LoginHandler;
class MetricEventDurationObserver;
class NavigationControllerRestoredObserver;
+class NewTabUILoadObserver;
class Profile;
struct AutomationMsg_Find_Params;
struct Reposition_Params;
@@ -342,8 +344,8 @@ class AutomationProvider
#endif // defined(OS_WIN) && !defined(USE_AURA)
scoped_ptr<IPC::ChannelProxy> channel_;
- scoped_ptr<content::NotificationObserver> new_tab_ui_load_observer_;
- scoped_ptr<content::NotificationObserver> find_in_page_observer_;
+ scoped_ptr<NewTabUILoadObserver> new_tab_ui_load_observer_;
+ scoped_ptr<FindInPageNotificationObserver> find_in_page_observer_;
// True iff we should enable observers that check for initial load conditions.
bool use_initial_load_observers_;