chrome/browser/external_tab_container_win.h - Issue 8551002: browser: Add missing OVERRIDE annotation to ExternalTabContainer implementing TabContentsDelegate.

Unified Diff: chrome/browser/external_tab_container_win.h

Issue 8551002: browser: Add missing OVERRIDE annotation to ExternalTabContainer implementing TabContentsDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ShowPageInfo does not override any base class methods Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/external_tab_container_win.h

diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h

index df64dc4c2b03cec0c3cd49c1c5738d88769bad9b..e014e82a04b3680140e6e144f94c19a118dec872 100644

--- a/chrome/browser/external_tab_container_win.h

+++ b/chrome/browser/external_tab_container_win.h

@@ -128,45 +128,45 @@ class ExternalTabContainer : public TabContentsDelegate,

virtual TabContents* OpenURLFromTab(TabContents* source,

const OpenURLParams& params) OVERRIDE;

virtual void NavigationStateChanged(const TabContents* source,

- unsigned changed_flags);

+ unsigned changed_flags) OVERRIDE;

virtual void AddNewContents(TabContents* source,

TabContents* new_contents,

WindowOpenDisposition disposition,

const gfx::Rect& initial_pos,

- bool user_gesture);

- virtual void CloseContents(TabContents* source);

- virtual void MoveContents(TabContents* source, const gfx::Rect& pos);

- virtual bool IsPopup(const TabContents* source) const;

+ bool user_gesture) OVERRIDE;

+ virtual void CloseContents(TabContents* source) OVERRIDE;

+ virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE;

+ virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE;

virtual void UpdateTargetURL(TabContents* source, int32 page_id,

- const GURL& url);

- virtual void ContentsZoomChange(bool zoom_in);

- virtual gfx::NativeWindow GetFrameNativeWindow();

+ const GURL& url) OVERRIDE;

+ virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;

+ virtual gfx::NativeWindow GetFrameNativeWindow() OVERRIDE;

virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,

- bool* is_keyboard_shortcut);

- virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);

- virtual bool TakeFocus(bool reverse);

- virtual bool CanDownload(TabContents* source, int request_id);

- virtual bool OnGoToEntryOffset(int offset);

- virtual void ShowPageInfo(Profile* profile,

- const GURL& url,

- const NavigationEntry::SSLStatus& ssl,

- bool show_history);

- virtual bool HandleContextMenu(const ContextMenuParams& params);

- virtual bool ExecuteContextMenuCommand(int command);

+ bool* is_keyboard_shortcut) OVERRIDE;

+ virtual void HandleKeyboardEvent(

+ const NativeWebKeyboardEvent& event) OVERRIDE;

+ virtual bool TakeFocus(bool reverse) OVERRIDE;

+ virtual bool CanDownload(TabContents* source, int request_id) OVERRIDE;

+ virtual bool OnGoToEntryOffset(int offset) OVERRIDE;

+ virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;

+ virtual bool ExecuteContextMenuCommand(int command) OVERRIDE;

virtual void BeforeUnloadFired(TabContents* tab,

bool proceed,

- bool* proceed_to_fire_unload);

- virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator();

- virtual void ShowRepostFormWarningDialog(TabContents* tab_contents);

- virtual void RunFileChooser(TabContents* tab,

- const ViewHostMsg_RunFileChooser_Params& params);

- virtual void EnumerateDirectory(TabContents* tab, int request_id,

- const FilePath& path);

+ bool* proceed_to_fire_unload) OVERRIDE;

+ virtual content::JavaScriptDialogCreator*

+ GetJavaScriptDialogCreator() OVERRIDE;

+ virtual void ShowRepostFormWarningDialog(TabContents* tab_contents) OVERRIDE;

+ virtual void RunFileChooser(

+ TabContents* tab,

+ const ViewHostMsg_RunFileChooser_Params& params) OVERRIDE;

+ virtual void EnumerateDirectory(TabContents* tab,

+ int request_id,

+ const FilePath& path) OVERRIDE;

virtual void JSOutOfMemory(TabContents* tab);

virtual void RegisterProtocolHandler(TabContents* tab,

const std::string& protocol,

const GURL& url,

- const string16& title);

+ const string16& title) OVERRIDE;

virtual void RegisterIntentHandler(TabContents* tab,

const string16& action,

const string16& type,

@@ -182,9 +182,14 @@ class ExternalTabContainer : public TabContentsDelegate,

int number_of_matches,

const gfx::Rect& selection_rect,

int active_match_ordinal,

- bool final_update);

+ bool final_update) OVERRIDE;

virtual void CrashedPlugin(TabContents* tab,

- const FilePath& plugin_path);

+ const FilePath& plugin_path) OVERRIDE;

+ virtual void ShowPageInfo(Profile* profile,

+ const GURL& url,

+ const NavigationEntry::SSLStatus& ssl,

+ bool show_history);

Lei Zhang 2011/11/14 20:51:32 Doesn't this need an OVERRIDE, since it's overridi

void RegisterRenderViewHost(RenderViewHost* render_view_host);

void UnregisterRenderViewHost(RenderViewHost* render_view_host);

« no previous file with comments | « no previous file | chrome/browser/external_tab_container_win.cc » ('j') | no next file with comments »