diff options
Diffstat (limited to 'chrome/renderer')
34 files changed, 71 insertions, 68 deletions
diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc index 492d2ba..57e8d1a 100644 --- a/chrome/renderer/autofill/autofill_agent.cc +++ b/chrome/renderer/autofill/autofill_agent.cc @@ -50,7 +50,7 @@ namespace autofill { AutofillAgent::AutofillAgent( RenderView* render_view, PasswordAutofillManager* password_autofill_manager) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), password_autofill_manager_(password_autofill_manager), autofill_query_id_(0), autofill_action_(AUTOFILL_NONE), diff --git a/chrome/renderer/autofill/autofill_agent.h b/chrome/renderer/autofill/autofill_agent.h index 33fcb0f..2a64196 100644 --- a/chrome/renderer/autofill/autofill_agent.h +++ b/chrome/renderer/autofill/autofill_agent.h @@ -14,7 +14,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/renderer/autofill/form_cache.h" #include "chrome/renderer/page_click_listener.h" -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" @@ -40,7 +40,7 @@ class PasswordAutofillManager; // - password form fill, refered to as Password Autofill, and // - entire form fill based on one field entry, referred to as Form Autofill. -class AutofillAgent : public RenderViewObserver, +class AutofillAgent : public content::RenderViewObserver, public PageClickListener, public WebKit::WebAutofillClient { public: diff --git a/chrome/renderer/autofill/password_autofill_manager.cc b/chrome/renderer/autofill/password_autofill_manager.cc index 7277461..63fd4a3 100644 --- a/chrome/renderer/autofill/password_autofill_manager.cc +++ b/chrome/renderer/autofill/password_autofill_manager.cc @@ -203,7 +203,7 @@ namespace autofill { PasswordAutofillManager::PasswordAutofillManager( RenderView* render_view) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { } diff --git a/chrome/renderer/autofill/password_autofill_manager.h b/chrome/renderer/autofill/password_autofill_manager.h index bdaaa06..f03b8b3 100644 --- a/chrome/renderer/autofill/password_autofill_manager.h +++ b/chrome/renderer/autofill/password_autofill_manager.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/renderer/page_click_listener.h" -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" #include "webkit/glue/password_form_dom_manager.h" @@ -24,7 +24,7 @@ namespace autofill { // This class is responsible for filling password forms. // There is one PasswordAutofillManager per RenderView. -class PasswordAutofillManager : public RenderViewObserver, +class PasswordAutofillManager : public content::RenderViewObserver, public PageClickListener { public: explicit PasswordAutofillManager(RenderView* render_view); diff --git a/chrome/renderer/automation/automation_renderer_helper.cc b/chrome/renderer/automation/automation_renderer_helper.cc index cba167e..3eea3fd 100644 --- a/chrome/renderer/automation/automation_renderer_helper.cc +++ b/chrome/renderer/automation/automation_renderer_helper.cc @@ -13,7 +13,7 @@ using WebKit::WebFrame; using WebKit::WebURL; AutomationRendererHelper::AutomationRendererHelper(RenderView* render_view) - : RenderViewObserver(render_view) { + : content::RenderViewObserver(render_view) { } AutomationRendererHelper::~AutomationRendererHelper() { } diff --git a/chrome/renderer/automation/automation_renderer_helper.h b/chrome/renderer/automation/automation_renderer_helper.h index f601f04..9f759f6 100644 --- a/chrome/renderer/automation/automation_renderer_helper.h +++ b/chrome/renderer/automation/automation_renderer_helper.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_AUTOMATION_AUTOMATION_RENDERER_HELPER_H_ #pragma once -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" namespace WebKit { class WebFrame; @@ -15,7 +15,7 @@ class WebURL; // Filters automation/testing messages sent to a |RenderView| and sends // automation/testing messages to the browser. -class AutomationRendererHelper : public RenderViewObserver { +class AutomationRendererHelper : public content::RenderViewObserver { public: explicit AutomationRendererHelper(RenderView* render_view); virtual ~AutomationRendererHelper(); diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc index a2296c2..1a6a750 100644 --- a/chrome/renderer/blocked_plugin.cc +++ b/chrome/renderer/blocked_plugin.cc @@ -63,7 +63,7 @@ BlockedPlugin::BlockedPlugin(RenderView* render_view, const string16& message, bool is_blocked_for_prerendering, bool allow_loading) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), frame_(frame), plugin_params_(params), is_blocked_for_prerendering_(is_blocked_for_prerendering), diff --git a/chrome/renderer/blocked_plugin.h b/chrome/renderer/blocked_plugin.h index cf53ec7..0d94f16 100644 --- a/chrome/renderer/blocked_plugin.h +++ b/chrome/renderer/blocked_plugin.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_BLOCKED_PLUGIN_H_ #pragma once -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" #include "webkit/glue/cpp_bound_class.h" #include "webkit/plugins/npapi/webview_plugin.h" @@ -23,7 +23,7 @@ namespace webkit_glue { struct CustomContextMenuContext; } -class BlockedPlugin : public RenderViewObserver, +class BlockedPlugin : public content::RenderViewObserver, public CppBoundClass, public webkit::npapi::WebViewPlugin::Delegate { public: diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index 444eb07..1d47627 100644 --- a/chrome/renderer/chrome_render_view_observer.cc +++ b/chrome/renderer/chrome_render_view_observer.cc @@ -206,7 +206,7 @@ ChromeRenderViewObserver::ChromeRenderViewObserver( ChromeRenderProcessObserver* chrome_render_process_observer, ExtensionDispatcher* extension_dispatcher, TranslateHelper* translate_helper) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), chrome_render_process_observer_(chrome_render_process_observer), extension_dispatcher_(extension_dispatcher), content_settings_(content_settings), diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h index a52c311..d09c35c 100644 --- a/chrome/renderer/chrome_render_view_observer.h +++ b/chrome/renderer/chrome_render_view_observer.h @@ -11,8 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "base/task.h" +#include "content/public/renderer/render_view_observer.h" #include "content/renderer/render_view.h" -#include "content/renderer/render_view_observer.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPermissionClient.h" @@ -37,7 +37,7 @@ class ImageResourceFetcher; // This class holds the Chrome specific parts of RenderView, and has the same // lifetime. -class ChromeRenderViewObserver : public RenderViewObserver, +class ChromeRenderViewObserver : public content::RenderViewObserver, public WebKit::WebPermissionClient { public: // translate_helper can be NULL. diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index 8383fa4..babdf0c 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -56,8 +56,8 @@ static bool IsWhitelistedForContentSettings(WebFrame* frame) { ContentSettings ContentSettingsObserver::default_settings_; ContentSettingsObserver::ContentSettingsObserver(RenderView* render_view) - : RenderViewObserver(render_view), - RenderViewObserverTracker<ContentSettingsObserver>(render_view), + : content::RenderViewObserver(render_view), + content::RenderViewObserverTracker<ContentSettingsObserver>(render_view), plugins_temporarily_allowed_(false) { ClearBlockedContentSettings(); } diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h index c86e10d..56e1164 100644 --- a/chrome/renderer/content_settings_observer.h +++ b/chrome/renderer/content_settings_observer.h @@ -9,8 +9,8 @@ #include <map> #include "chrome/common/content_settings.h" -#include "content/renderer/render_view_observer.h" -#include "content/renderer/render_view_observer_tracker.h" +#include "content/public/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer_tracker.h" class GURL; @@ -21,8 +21,8 @@ class WebURL; // Handles blocking content per content settings for each RenderView. class ContentSettingsObserver - : public RenderViewObserver, - public RenderViewObserverTracker<ContentSettingsObserver> { + : public content::RenderViewObserver, + public content::RenderViewObserverTracker<ContentSettingsObserver> { public: explicit ContentSettingsObserver(RenderView* render_view); virtual ~ContentSettingsObserver(); diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc index c0f2fae..c1812cf 100644 --- a/chrome/renderer/extensions/extension_helper.cc +++ b/chrome/renderer/extensions/extension_helper.cc @@ -48,8 +48,8 @@ static base::LazyInstance<SchedulerMap> g_schedulers(base::LINKER_INITIALIZED); ExtensionHelper::ExtensionHelper(RenderView* render_view, ExtensionDispatcher* extension_dispatcher) - : RenderViewObserver(render_view), - RenderViewObserverTracker<ExtensionHelper>(render_view), + : content::RenderViewObserver(render_view), + content::RenderViewObserverTracker<ExtensionHelper>(render_view), extension_dispatcher_(extension_dispatcher), pending_app_icon_requests_(0), view_type_(ViewType::INVALID), diff --git a/chrome/renderer/extensions/extension_helper.h b/chrome/renderer/extensions/extension_helper.h index 4365cd8..40f6d6b 100644 --- a/chrome/renderer/extensions/extension_helper.h +++ b/chrome/renderer/extensions/extension_helper.h @@ -9,9 +9,9 @@ #include <map> #include "content/common/view_types.h" +#include "content/public/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer_tracker.h" #include "content/renderer/render_view.h" -#include "content/renderer/render_view_observer.h" -#include "content/renderer/render_view_observer_tracker.h" class ExtensionDispatcher; class GURL; @@ -27,8 +27,9 @@ class ResourceFetcher; } // RenderView-level plumbing for extension features. -class ExtensionHelper : public RenderViewObserver, - public RenderViewObserverTracker<ExtensionHelper> { +class ExtensionHelper + : public content::RenderViewObserver, + public content::RenderViewObserverTracker<ExtensionHelper> { public: ExtensionHelper(RenderView* render_view, ExtensionDispatcher* extension_dispatcher); diff --git a/chrome/renderer/frame_sniffer.cc b/chrome/renderer/frame_sniffer.cc index e026b39..d4c3674 100644 --- a/chrome/renderer/frame_sniffer.cc +++ b/chrome/renderer/frame_sniffer.cc @@ -12,7 +12,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" FrameSniffer::FrameSniffer(RenderView* render_view, const string16 &frame_name) - : RenderViewObserver(render_view), frame_name_(frame_name) { + : content::RenderViewObserver(render_view), frame_name_(frame_name) { } FrameSniffer::~FrameSniffer() { diff --git a/chrome/renderer/frame_sniffer.h b/chrome/renderer/frame_sniffer.h index ae022ba..55af6d02 100644 --- a/chrome/renderer/frame_sniffer.h +++ b/chrome/renderer/frame_sniffer.h @@ -7,11 +7,11 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" // Class which observes events from the frame with specific name and sends IPC // messages to be handled by RenderViewHostObserver. -class FrameSniffer : public RenderViewObserver { +class FrameSniffer : public content::RenderViewObserver { public: FrameSniffer(RenderView* render_view, const string16 &frame_name); virtual ~FrameSniffer(); diff --git a/chrome/renderer/page_click_tracker.cc b/chrome/renderer/page_click_tracker.cc index 7932397..c06cc4b 100644 --- a/chrome/renderer/page_click_tracker.cc +++ b/chrome/renderer/page_click_tracker.cc @@ -48,7 +48,7 @@ const WebInputElement GetTextWebInputElement(const WebNode& node) { } // namespace PageClickTracker::PageClickTracker(RenderView* render_view) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), was_focused_(false) { } diff --git a/chrome/renderer/page_click_tracker.h b/chrome/renderer/page_click_tracker.h index ac2a80d..29b3b8f 100644 --- a/chrome/renderer/page_click_tracker.h +++ b/chrome/renderer/page_click_tracker.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/observer_list.h" -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEventListener.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" @@ -28,7 +28,7 @@ class PageClickListener; // could easily be changed to report click on any type of WebNode. // // There is one PageClickTracker per RenderView. -class PageClickTracker : public RenderViewObserver, +class PageClickTracker : public content::RenderViewObserver, public WebKit::WebDOMEventListener { public: explicit PageClickTracker(RenderView* render_view); diff --git a/chrome/renderer/page_load_histograms.cc b/chrome/renderer/page_load_histograms.cc index 147e0f8..856df40 100644 --- a/chrome/renderer/page_load_histograms.cc +++ b/chrome/renderer/page_load_histograms.cc @@ -85,7 +85,7 @@ enum AbandonType { PageLoadHistograms::PageLoadHistograms( RenderView* render_view, RendererHistogramSnapshots* histogram_snapshots) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), cross_origin_access_count_(0), same_origin_access_count_(0), histogram_snapshots_(histogram_snapshots) { diff --git a/chrome/renderer/page_load_histograms.h b/chrome/renderer/page_load_histograms.h index 20463fd..be7aa16 100644 --- a/chrome/renderer/page_load_histograms.h +++ b/chrome/renderer/page_load_histograms.h @@ -6,12 +6,12 @@ #define CHROME_RENDERER_PAGE_LOAD_HISTOGRAMS_H_ #include "base/basictypes.h" -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" class NavigationState; class RendererHistogramSnapshots; -class PageLoadHistograms : public RenderViewObserver { +class PageLoadHistograms : public content::RenderViewObserver { public: PageLoadHistograms(RenderView* render_view, RendererHistogramSnapshots* histogram_snapshots); diff --git a/chrome/renderer/prerender/prerender_helper.cc b/chrome/renderer/prerender/prerender_helper.cc index 4a15668..c998b25 100644 --- a/chrome/renderer/prerender/prerender_helper.cc +++ b/chrome/renderer/prerender/prerender_helper.cc @@ -26,8 +26,8 @@ namespace prerender { PrerenderHelper::PrerenderHelper(RenderView* render_view) - : RenderViewObserver(render_view), - RenderViewObserverTracker<PrerenderHelper>(render_view), + : content::RenderViewObserver(render_view), + content::RenderViewObserverTracker<PrerenderHelper>(render_view), is_prerendering_(true), has_unrecorded_data_(false) { UpdateVisibilityState(); diff --git a/chrome/renderer/prerender/prerender_helper.h b/chrome/renderer/prerender/prerender_helper.h index 5c2c87c..068aa36 100644 --- a/chrome/renderer/prerender/prerender_helper.h +++ b/chrome/renderer/prerender/prerender_helper.h @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "base/time.h" -#include "content/renderer/render_view_observer.h" -#include "content/renderer/render_view_observer_tracker.h" +#include "content/public/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer_tracker.h" namespace prerender { @@ -19,8 +19,9 @@ namespace prerender { // prerendering starts and deleted as soon as just after the prerendering // histograms have been recorded for a displayed prerendered page. For // non-displayed pages, deleted on destruction of the RenderView. -class PrerenderHelper : public RenderViewObserver, - public RenderViewObserverTracker<PrerenderHelper> { +class PrerenderHelper + : public content::RenderViewObserver, + public content::RenderViewObserverTracker<PrerenderHelper> { public: explicit PrerenderHelper(RenderView* render_view); virtual ~PrerenderHelper(); diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index be463c0..7114a5d 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -490,8 +490,8 @@ void PrepareFrameAndViewForPrint::FinishPrinting() { } PrintWebViewHelper::PrintWebViewHelper(RenderView* render_view) - : RenderViewObserver(render_view), - RenderViewObserverTracker<PrintWebViewHelper>(render_view), + : content::RenderViewObserver(render_view), + content::RenderViewObserverTracker<PrintWebViewHelper>(render_view), print_web_view_(NULL), is_preview_(switches::IsPrintPreviewEnabled()), is_print_ready_metafile_sent_(false), diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h index 1884f9f..3c60a17 100644 --- a/chrome/renderer/print_web_view_helper.h +++ b/chrome/renderer/print_web_view_helper.h @@ -11,8 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "base/time.h" -#include "content/renderer/render_view_observer.h" -#include "content/renderer/render_view_observer_tracker.h" +#include "content/public/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer_tracker.h" #include "printing/metafile.h" #include "printing/metafile_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h" @@ -86,10 +86,11 @@ class PrepareFrameAndViewForPrint { // PrintWebViewHelper handles most of the printing grunt work for RenderView. // We plan on making print asynchronous and that will require copying the DOM // of the document and creating a new WebView with the contents. -class PrintWebViewHelper : public RenderViewObserver, - public RenderViewObserverTracker<PrintWebViewHelper>, - public WebKit::WebViewClient, - public WebKit::WebFrameClient { +class PrintWebViewHelper + : public content::RenderViewObserver, + public content::RenderViewObserverTracker<PrintWebViewHelper>, + public WebKit::WebViewClient, + public WebKit::WebFrameClient { public: explicit PrintWebViewHelper(RenderView* render_view); virtual ~PrintWebViewHelper(); diff --git a/chrome/renderer/safe_browsing/malware_dom_details.cc b/chrome/renderer/safe_browsing/malware_dom_details.cc index 866cae8..e488a76 100644 --- a/chrome/renderer/safe_browsing/malware_dom_details.cc +++ b/chrome/renderer/safe_browsing/malware_dom_details.cc @@ -28,7 +28,7 @@ MalwareDOMDetails* MalwareDOMDetails::Create(RenderView* render_view) { } MalwareDOMDetails::MalwareDOMDetails(RenderView* render_view) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), render_view_(render_view) { } diff --git a/chrome/renderer/safe_browsing/malware_dom_details.h b/chrome/renderer/safe_browsing/malware_dom_details.h index 6698aff..c91cbb1 100644 --- a/chrome/renderer/safe_browsing/malware_dom_details.h +++ b/chrome/renderer/safe_browsing/malware_dom_details.h @@ -16,7 +16,7 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/task.h" -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" class GURL; class RenderView; @@ -31,7 +31,7 @@ struct SafeBrowsingHostMsg_MalwareDOMDetails_Node; namespace safe_browsing { // There is one MalwareDOMDetails per RenderView. -class MalwareDOMDetails : public RenderViewObserver { +class MalwareDOMDetails : public content::RenderViewObserver { public: // An upper limit on the number of nodes we collect. Not const for the test. static uint32 kMaxNodes; diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc index 5b2aa54..8480e91 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc @@ -85,7 +85,7 @@ PhishingClassifierDelegate* PhishingClassifierDelegate::Create( PhishingClassifierDelegate::PhishingClassifierDelegate( RenderView* render_view, PhishingClassifier* classifier) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), last_main_frame_transition_(PageTransition::LINK), have_page_text_(false), is_classifying_(false) { diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h index 77a0397..4a8e7e1 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "content/common/page_transition_types.h" -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" #include "content/renderer/render_process_observer.h" #include "googleurl/src/gurl.h" @@ -34,7 +34,7 @@ class PhishingClassifierFilter : public RenderProcessObserver { DISALLOW_COPY_AND_ASSIGN(PhishingClassifierFilter); }; -class PhishingClassifierDelegate : public RenderViewObserver { +class PhishingClassifierDelegate : public content::RenderViewObserver { public: // The RenderView owns us. This object takes ownership of the classifier. // Note that if classifier is null, a default instance of PhishingClassifier diff --git a/chrome/renderer/searchbox.cc b/chrome/renderer/searchbox.cc index 9041c1f..01fe554 100644 --- a/chrome/renderer/searchbox.cc +++ b/chrome/renderer/searchbox.cc @@ -12,8 +12,8 @@ using WebKit::WebView; SearchBox::SearchBox(RenderView* render_view) - : RenderViewObserver(render_view), - RenderViewObserverTracker<SearchBox>(render_view), + : content::RenderViewObserver(render_view), + content::RenderViewObserverTracker<SearchBox>(render_view), verbatim_(false), selection_start_(0), selection_end_(0) { diff --git a/chrome/renderer/searchbox.h b/chrome/renderer/searchbox.h index b9d5f5c5..2e63e7f 100644 --- a/chrome/renderer/searchbox.h +++ b/chrome/renderer/searchbox.h @@ -11,12 +11,12 @@ #include "base/string16.h" #include "chrome/common/instant_types.h" -#include "content/renderer/render_view_observer.h" -#include "content/renderer/render_view_observer_tracker.h" +#include "content/public/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer_tracker.h" #include "ui/gfx/rect.h" -class SearchBox : public RenderViewObserver, - public RenderViewObserverTracker<SearchBox> { +class SearchBox : public content::RenderViewObserver, + public content::RenderViewObserverTracker<SearchBox> { public: explicit SearchBox(RenderView* render_view); virtual ~SearchBox(); diff --git a/chrome/renderer/spellchecker/spellcheck_provider.cc b/chrome/renderer/spellchecker/spellcheck_provider.cc index 70d32ef..794b204 100644 --- a/chrome/renderer/spellchecker/spellcheck_provider.cc +++ b/chrome/renderer/spellchecker/spellcheck_provider.cc @@ -23,7 +23,7 @@ using WebKit::WebVector; SpellCheckProvider::SpellCheckProvider(RenderView* render_view, SpellCheck* spellcheck) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), #if defined(OS_MACOSX) has_document_tag_(false), #endif diff --git a/chrome/renderer/spellchecker/spellcheck_provider.h b/chrome/renderer/spellchecker/spellcheck_provider.h index 2baf848..a2b29f7 100644 --- a/chrome/renderer/spellchecker/spellcheck_provider.h +++ b/chrome/renderer/spellchecker/spellcheck_provider.h @@ -9,7 +9,7 @@ #include <vector> #include "base/id_map.h" -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpellCheckClient.h" class RenderView; @@ -23,7 +23,7 @@ struct WebTextCheckingResult; // This class deals with invoking browser-side spellcheck mechanism // which is done asynchronously. -class SpellCheckProvider : public RenderViewObserver, +class SpellCheckProvider : public content::RenderViewObserver, public WebKit::WebSpellCheckClient { public: typedef IDMap<WebKit::WebTextCheckingCompletion> WebTextCheckCompletions; diff --git a/chrome/renderer/translate_helper.cc b/chrome/renderer/translate_helper.cc index 6710a9d..53708d7 100644 --- a/chrome/renderer/translate_helper.cc +++ b/chrome/renderer/translate_helper.cc @@ -48,7 +48,7 @@ static const char* const kAutoDetectionLanguage = "auto"; // TranslateHelper::TranslateHelper(RenderView* render_view, autofill::AutofillAgent* autofill) - : RenderViewObserver(render_view), + : content::RenderViewObserver(render_view), translation_pending_(false), page_id_(-1), autofill_(autofill), diff --git a/chrome/renderer/translate_helper.h b/chrome/renderer/translate_helper.h index 902f0bc..31b8979 100644 --- a/chrome/renderer/translate_helper.h +++ b/chrome/renderer/translate_helper.h @@ -10,7 +10,7 @@ #include "base/task.h" #include "chrome/common/translate_errors.h" -#include "content/renderer/render_view_observer.h" +#include "content/public/renderer/render_view_observer.h" namespace WebKit { class WebDocument; @@ -24,7 +24,7 @@ class AutofillAgent; // This class deals with page translation. // There is one TranslateHelper per RenderView. -class TranslateHelper : public RenderViewObserver { +class TranslateHelper : public content::RenderViewObserver { public: // autofill can be NULL. TranslateHelper(RenderView* render_view, autofill::AutofillAgent* autofill); |