summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/extensions/extension_host.h49
-rw-r--r--chrome/browser/notifications/balloon_host.h20
-rw-r--r--chrome/browser/tab_contents/background_contents.h23
-rw-r--r--content/browser/tab_contents/interstitial_page.h15
-rw-r--r--content/browser/tab_contents/tab_contents.h82
5 files changed, 98 insertions, 91 deletions
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 2f66a1f..d5870bd 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -111,41 +111,42 @@ class ExtensionHost : public RenderViewHostDelegate,
void DisableScrollbarsForSmallWindows(const gfx::Size& size_limit);
// RenderViewHostDelegate implementation.
- virtual bool OnMessageReceived(const IPC::Message& message);
- virtual const GURL& GetURL() const;
- virtual void RenderViewCreated(RenderViewHost* render_view_host);
- virtual ViewType::Type GetRenderViewType() const;
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual const GURL& GetURL() const OVERRIDE;
+ virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
+ virtual ViewType::Type GetRenderViewType() const OVERRIDE;
virtual void RenderViewGone(RenderViewHost* render_view_host,
base::TerminationStatus status,
- int error_code);
- virtual void DidNavigate(RenderViewHost* render_view_host,
- const ViewHostMsg_FrameNavigate_Params& params);
- virtual void DidStopLoading();
- virtual void DocumentAvailableInMainFrame(RenderViewHost* render_view_host);
+ int error_code) OVERRIDE;
+ virtual void DidNavigate(
+ RenderViewHost* render_view_host,
+ const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
+ virtual void DidStopLoading() OVERRIDE;
+ virtual void DocumentAvailableInMainFrame(
+ RenderViewHost* render_view_host) OVERRIDE;
virtual void DocumentOnLoadCompletedInMainFrame(
RenderViewHost* render_view_host,
- int32 page_id);
-
- // RenderViewHostDelegate implementation.
- virtual RenderViewHostDelegate::View* GetViewDelegate();
- virtual WebPreferences GetWebkitPrefs();
+ int32 page_id) OVERRIDE;
+ virtual RenderViewHostDelegate::View* GetViewDelegate() OVERRIDE;
+ virtual WebPreferences GetWebkitPrefs() OVERRIDE;
virtual void RunJavaScriptMessage(const RenderViewHost* rvh,
const string16& message,
const string16& default_prompt,
const GURL& frame_url,
const int flags,
IPC::Message* reply_msg,
- bool* did_suppress_message);
- virtual void Close(RenderViewHost* render_view_host);
- virtual RendererPreferences GetRendererPrefs(Profile* profile) const;
+ bool* did_suppress_message) OVERRIDE;
+ virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
+ virtual RendererPreferences GetRendererPrefs(Profile* profile) const OVERRIDE;
virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
- bool* is_keyboard_shortcut);
- virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
- virtual void HandleMouseMove();
- virtual void HandleMouseDown();
- virtual void HandleMouseLeave();
- virtual void HandleMouseUp();
- virtual void HandleMouseActivate();
+ bool* is_keyboard_shortcut) OVERRIDE;
+ virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event)
+ OVERRIDE;
+ virtual void HandleMouseMove() OVERRIDE;
+ virtual void HandleMouseDown() OVERRIDE;
+ virtual void HandleMouseLeave() OVERRIDE;
+ virtual void HandleMouseUp() OVERRIDE;
+ virtual void HandleMouseActivate() OVERRIDE;
// RenderViewHostDelegate::View
virtual void CreateNewWindow(
diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h
index 35ba1ff..1feabb2 100644
--- a/chrome/browser/notifications/balloon_host.h
+++ b/chrome/browser/notifications/balloon_host.h
@@ -50,19 +50,19 @@ class BalloonHost : public RenderViewHostDelegate,
const string16& GetSource() const;
// RenderViewHostDelegate overrides.
- virtual WebPreferences GetWebkitPrefs();
- virtual const GURL& GetURL() const;
- virtual void Close(RenderViewHost* render_view_host);
- virtual void RenderViewCreated(RenderViewHost* render_view_host);
- virtual void RenderViewReady(RenderViewHost* render_view_host);
+ virtual WebPreferences GetWebkitPrefs() OVERRIDE;
+ virtual const GURL& GetURL() const OVERRIDE;
+ virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
+ virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
+ virtual void RenderViewReady(RenderViewHost* render_view_host) OVERRIDE;
virtual void RenderViewGone(RenderViewHost* render_view_host,
base::TerminationStatus status,
- int error_code);
+ int error_code) OVERRIDE;
virtual void UpdateTitle(RenderViewHost* render_view_host,
- int32 page_id, const std::wstring& title) {}
- virtual ViewType::Type GetRenderViewType() const;
- virtual RenderViewHostDelegate::View* GetViewDelegate();
- virtual void HandleMouseDown();
+ int32 page_id, const std::wstring& title) OVERRIDE {}
+ virtual ViewType::Type GetRenderViewType() const OVERRIDE;
+ virtual RenderViewHostDelegate::View* GetViewDelegate() OVERRIDE;
+ virtual void HandleMouseDown() OVERRIDE;
// RenderViewHostDelegate::View methods. Only the ones for opening new
// windows are currently implemented.
diff --git a/chrome/browser/tab_contents/background_contents.h b/chrome/browser/tab_contents/background_contents.h
index 70085f2..dca405c 100644
--- a/chrome/browser/tab_contents/background_contents.h
+++ b/chrome/browser/tab_contents/background_contents.h
@@ -59,25 +59,26 @@ class BackgroundContents : public RenderViewHostDelegate,
RenderViewHost* render_view_host() { return render_view_host_; }
// RenderViewHostDelegate implementation.
- virtual BackgroundContents* GetAsBackgroundContents();
- virtual RenderViewHostDelegate::View* GetViewDelegate();
- virtual const GURL& GetURL() const;
- virtual ViewType::Type GetRenderViewType() const;
- virtual void DidNavigate(RenderViewHost* render_view_host,
- const ViewHostMsg_FrameNavigate_Params& params);
- virtual WebPreferences GetWebkitPrefs();
+ virtual BackgroundContents* GetAsBackgroundContents() OVERRIDE;
+ virtual RenderViewHostDelegate::View* GetViewDelegate() OVERRIDE;
+ virtual const GURL& GetURL() const OVERRIDE;
+ virtual ViewType::Type GetRenderViewType() const OVERRIDE;
+ virtual void DidNavigate(
+ RenderViewHost* render_view_host,
+ const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
+ virtual WebPreferences GetWebkitPrefs() OVERRIDE;
virtual void RunJavaScriptMessage(const RenderViewHost* rvh,
const string16& message,
const string16& default_prompt,
const GURL& frame_url,
const int flags,
IPC::Message* reply_msg,
- bool* did_suppress_message);
- virtual void Close(RenderViewHost* render_view_host);
- virtual RendererPreferences GetRendererPrefs(Profile* profile) const;
+ bool* did_suppress_message) OVERRIDE;
+ virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
+ virtual RendererPreferences GetRendererPrefs(Profile* profile) const OVERRIDE;
virtual void RenderViewGone(RenderViewHost* rvh,
base::TerminationStatus status,
- int error_code);
+ int error_code) OVERRIDE;
// RenderViewHostDelegate::View
virtual void CreateNewWindow(
diff --git a/content/browser/tab_contents/interstitial_page.h b/content/browser/tab_contents/interstitial_page.h
index 5087762..a0e6d2a 100644
--- a/content/browser/tab_contents/interstitial_page.h
+++ b/content/browser/tab_contents/interstitial_page.h
@@ -116,17 +116,18 @@ class InterstitialPage : public NotificationObserver,
const NotificationDetails& details);
// RenderViewHostDelegate implementation:
- virtual View* GetViewDelegate();
- virtual const GURL& GetURL() const;
+ virtual View* GetViewDelegate() OVERRIDE;
+ virtual const GURL& GetURL() const OVERRIDE;
virtual void RenderViewGone(RenderViewHost* render_view_host,
base::TerminationStatus status,
- int error_code);
- virtual void DidNavigate(RenderViewHost* render_view_host,
- const ViewHostMsg_FrameNavigate_Params& params);
+ int error_code) OVERRIDE;
+ virtual void DidNavigate(
+ RenderViewHost* render_view_host,
+ const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
virtual void UpdateTitle(RenderViewHost* render_view_host,
int32 page_id,
- const std::wstring& title);
- virtual RendererPreferences GetRendererPrefs(Profile* profile) const;
+ const std::wstring& title) OVERRIDE;
+ virtual RendererPreferences GetRendererPrefs(Profile* profile) const OVERRIDE;
// Invoked with the NavigationEntry that is going to be added to the
// navigation controller.
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 51b54ae..933871f 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -620,39 +620,40 @@ class TabContents : public PageNavigator,
// RenderViewHostDelegate ----------------------------------------------------
// RenderViewHostDelegate implementation.
- virtual RenderViewHostDelegate::View* GetViewDelegate();
+ virtual RenderViewHostDelegate::View* GetViewDelegate() OVERRIDE;
virtual RenderViewHostDelegate::RendererManagement*
- GetRendererManagementDelegate();
- virtual TabContents* GetAsTabContents();
- virtual ViewType::Type GetRenderViewType() const;
- virtual void RenderViewCreated(RenderViewHost* render_view_host);
- virtual void RenderViewReady(RenderViewHost* render_view_host);
+ GetRendererManagementDelegate() OVERRIDE;
+ virtual TabContents* GetAsTabContents() OVERRIDE;
+ virtual ViewType::Type GetRenderViewType() const OVERRIDE;
+ virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
+ virtual void RenderViewReady(RenderViewHost* render_view_host) OVERRIDE;
virtual void RenderViewGone(RenderViewHost* render_view_host,
base::TerminationStatus status,
- int error_code);
- virtual void RenderViewDeleted(RenderViewHost* render_view_host);
- virtual void DidNavigate(RenderViewHost* render_view_host,
- const ViewHostMsg_FrameNavigate_Params& params);
+ int error_code) OVERRIDE;
+ virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE;
+ virtual void DidNavigate(
+ RenderViewHost* render_view_host,
+ const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
virtual void UpdateState(RenderViewHost* render_view_host,
int32 page_id,
- const std::string& state);
+ const std::string& state) OVERRIDE;
virtual void UpdateTitle(RenderViewHost* render_view_host,
int32 page_id,
- const std::wstring& title);
+ const std::wstring& title) OVERRIDE;
virtual void UpdateEncoding(RenderViewHost* render_view_host,
- const std::string& encoding);
- virtual void UpdateTargetURL(int32 page_id, const GURL& url);
- virtual void Close(RenderViewHost* render_view_host);
- virtual void RequestMove(const gfx::Rect& new_bounds);
- virtual void DidStartLoading();
- virtual void DidStopLoading();
- virtual void DidCancelLoading();
- virtual void DidChangeLoadProgress(double progress);
+ const std::string& encoding) OVERRIDE;
+ virtual void UpdateTargetURL(int32 page_id, const GURL& url) OVERRIDE;
+ virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
+ virtual void RequestMove(const gfx::Rect& new_bounds) OVERRIDE;
+ virtual void DidStartLoading() OVERRIDE;
+ virtual void DidStopLoading() OVERRIDE;
+ virtual void DidCancelLoading() OVERRIDE;
+ virtual void DidChangeLoadProgress(double progress) OVERRIDE;
virtual void DocumentOnLoadCompletedInMainFrame(
RenderViewHost* render_view_host,
- int32 page_id);
+ int32 page_id) OVERRIDE;
virtual void RequestOpenURL(const GURL& url, const GURL& referrer,
- WindowOpenDisposition disposition);
+ WindowOpenDisposition disposition) OVERRIDE;
virtual void RunJavaScriptMessage(const RenderViewHost* rvh,
const string16& message,
const string16& default_prompt,
@@ -662,25 +663,28 @@ class TabContents : public PageNavigator,
bool* did_suppress_message) OVERRIDE;
virtual void RunBeforeUnloadConfirm(const RenderViewHost* rvh,
const string16& message,
- IPC::Message* reply_msg);
- virtual RendererPreferences GetRendererPrefs(Profile* profile) const;
- virtual WebPreferences GetWebkitPrefs();
- virtual void OnUserGesture();
- virtual void OnIgnoredUIEvent();
+ IPC::Message* reply_msg) OVERRIDE;
+ virtual RendererPreferences GetRendererPrefs(Profile* profile) const OVERRIDE;
+ virtual WebPreferences GetWebkitPrefs() OVERRIDE;
+ virtual void OnUserGesture() OVERRIDE;
+ virtual void OnIgnoredUIEvent() OVERRIDE;
virtual void RendererUnresponsive(RenderViewHost* render_view_host,
- bool is_during_unload);
- virtual void RendererResponsive(RenderViewHost* render_view_host);
- virtual void LoadStateChanged(const GURL& url, net::LoadState load_state,
- uint64 upload_position, uint64 upload_size);
- virtual void WorkerCrashed();
- virtual void Activate();
- virtual void Deactivate();
- virtual void LostCapture();
+ bool is_during_unload) OVERRIDE;
+ virtual void RendererResponsive(RenderViewHost* render_view_host) OVERRIDE;
+ virtual void LoadStateChanged(const GURL& url,
+ net::LoadState load_state,
+ uint64 upload_position,
+ uint64 upload_size) OVERRIDE;
+ virtual void WorkerCrashed() OVERRIDE;
+ virtual void Activate() OVERRIDE;
+ virtual void Deactivate() OVERRIDE;
+ virtual void LostCapture() OVERRIDE;
virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
- bool* is_keyboard_shortcut);
- virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
- virtual void HandleMouseUp();
- virtual void HandleMouseActivate();
+ bool* is_keyboard_shortcut) OVERRIDE;
+ virtual void HandleKeyboardEvent(
+ const NativeWebKeyboardEvent& event) OVERRIDE;
+ virtual void HandleMouseUp() OVERRIDE;
+ virtual void HandleMouseActivate() OVERRIDE;
// RenderViewHostManager::Delegate -------------------------------------------
generated by cgit v1.1 at 2025-03-11 01:14:38 +0000