Commit fe6ce592 authored by tfarina@chromium.org's avatar tfarina@chromium.org

gtk: Add missing OVERRIDE annotations to BrowserWindowGtk.

R=erg@chromium.org

Review URL: http://codereview.chromium.org/8608002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110955 0039d316-1c4b-4281-b951-d872f2087c98
parent 1cd90f74
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include <string> #include <string>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/timer.h" #include "base/timer.h"
#include "build/build_config.h" #include "build/build_config.h"
...@@ -67,87 +69,91 @@ class BrowserWindowGtk : public BrowserWindow, ...@@ -67,87 +69,91 @@ class BrowserWindowGtk : public BrowserWindow,
// Returns the type of text used for title. // Returns the type of text used for title.
virtual TitleDecoration GetWindowTitle(std::string* title) const; virtual TitleDecoration GetWindowTitle(std::string* title) const;
// Overridden from BrowserWindow // Overridden from BrowserWindow:
virtual void Show(); virtual void Show() OVERRIDE;
virtual void ShowInactive(); virtual void ShowInactive() OVERRIDE;
virtual void SetBounds(const gfx::Rect& bounds); virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
virtual void Close(); virtual void Close() OVERRIDE;
virtual void Activate(); virtual void Activate() OVERRIDE;
virtual void Deactivate(); virtual void Deactivate() OVERRIDE;
virtual bool IsActive() const; virtual bool IsActive() const OVERRIDE;
virtual void FlashFrame(); virtual void FlashFrame() OVERRIDE;
virtual gfx::NativeWindow GetNativeHandle(); virtual gfx::NativeWindow GetNativeHandle() OVERRIDE;
virtual BrowserWindowTesting* GetBrowserWindowTesting(); virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
virtual StatusBubble* GetStatusBubble(); virtual StatusBubble* GetStatusBubble() OVERRIDE;
virtual void ToolbarSizeChanged(bool is_animating); virtual void ToolbarSizeChanged(bool is_animating) OVERRIDE;
virtual void UpdateTitleBar(); virtual void UpdateTitleBar() OVERRIDE;
virtual void BookmarkBarStateChanged( virtual void BookmarkBarStateChanged(
BookmarkBar::AnimateChangeType change_type); BookmarkBar::AnimateChangeType change_type) OVERRIDE;
virtual void UpdateDevTools(); virtual void UpdateDevTools() OVERRIDE;
virtual void UpdateLoadingAnimations(bool should_animate); virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
virtual void SetStarredState(bool is_starred); virtual void SetStarredState(bool is_starred) OVERRIDE;
virtual gfx::Rect GetRestoredBounds() const; virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
virtual gfx::Rect GetBounds() const; virtual gfx::Rect GetBounds() const OVERRIDE;
virtual bool IsMaximized() const; virtual bool IsMaximized() const OVERRIDE;
virtual bool IsMinimized() const; virtual bool IsMinimized() const OVERRIDE;
virtual void EnterFullscreen( virtual void EnterFullscreen(
const GURL& url, FullscreenExitBubbleType type) OVERRIDE; const GURL& url, FullscreenExitBubbleType type) OVERRIDE;
virtual void ExitFullscreen() OVERRIDE; virtual void ExitFullscreen() OVERRIDE;
virtual void UpdateFullscreenExitBubbleContent( virtual void UpdateFullscreenExitBubbleContent(
const GURL& url, const GURL& url,
FullscreenExitBubbleType bubble_type) OVERRIDE; FullscreenExitBubbleType bubble_type) OVERRIDE;
virtual bool IsFullscreen() const; virtual bool IsFullscreen() const OVERRIDE;
virtual bool IsFullscreenBubbleVisible() const; virtual bool IsFullscreenBubbleVisible() const OVERRIDE;
virtual LocationBar* GetLocationBar() const; virtual LocationBar* GetLocationBar() const OVERRIDE;
virtual void SetFocusToLocationBar(bool select_all); virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
virtual void UpdateReloadStopState(bool is_loading, bool force); virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE;
virtual void UpdateToolbar(TabContentsWrapper* contents, virtual void UpdateToolbar(TabContentsWrapper* contents,
bool should_restore_state); bool should_restore_state) OVERRIDE;
virtual void FocusToolbar(); virtual void FocusToolbar() OVERRIDE;
virtual void FocusAppMenu(); virtual void FocusAppMenu() OVERRIDE;
virtual void FocusBookmarksToolbar(); virtual void FocusBookmarksToolbar() OVERRIDE;
virtual void FocusChromeOSStatus(); virtual void FocusChromeOSStatus() OVERRIDE;
virtual void RotatePaneFocus(bool forwards); virtual void RotatePaneFocus(bool forwards) OVERRIDE;
virtual bool IsBookmarkBarVisible() const; virtual bool IsBookmarkBarVisible() const OVERRIDE;
virtual bool IsBookmarkBarAnimating() const; virtual bool IsBookmarkBarAnimating() const OVERRIDE;
virtual bool IsTabStripEditable() const; virtual bool IsTabStripEditable() const OVERRIDE;
virtual bool IsToolbarVisible() const; virtual bool IsToolbarVisible() const OVERRIDE;
virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, virtual void ConfirmAddSearchProvider(const TemplateURL* template_url,
Profile* profile); Profile* profile) OVERRIDE;
virtual void ToggleBookmarkBar(); virtual void ToggleBookmarkBar() OVERRIDE;
virtual void ShowAboutChromeDialog(); virtual void ShowAboutChromeDialog() OVERRIDE;
virtual void ShowUpdateChromeDialog(); virtual void ShowUpdateChromeDialog() OVERRIDE;
virtual void ShowTaskManager(); virtual void ShowTaskManager() OVERRIDE;
virtual void ShowBackgroundPages(); virtual void ShowBackgroundPages() OVERRIDE;
virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked); virtual void ShowBookmarkBubble(const GURL& url,
virtual bool IsDownloadShelfVisible() const; bool already_bookmarked) OVERRIDE;
virtual DownloadShelf* GetDownloadShelf(); virtual bool IsDownloadShelfVisible() const OVERRIDE;
virtual void ShowRepostFormWarningDialog(TabContents* tab_contents); virtual DownloadShelf* GetDownloadShelf() OVERRIDE;
virtual void ShowCollectedCookiesDialog(TabContentsWrapper* tab_contents); virtual void ShowRepostFormWarningDialog(TabContents* tab_contents) OVERRIDE;
virtual void ConfirmBrowserCloseWithPendingDownloads(); virtual void ShowCollectedCookiesDialog(
virtual void UserChangedTheme(); TabContentsWrapper* tab_contents) OVERRIDE;
virtual int GetExtraRenderViewHeight() const; virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE;
virtual void TabContentsFocused(TabContents* tab_contents); virtual void UserChangedTheme() OVERRIDE;
virtual int GetExtraRenderViewHeight() const OVERRIDE;
virtual void TabContentsFocused(TabContents* tab_contents) OVERRIDE;
virtual void ShowPageInfo(Profile* profile, virtual void ShowPageInfo(Profile* profile,
const GURL& url, const GURL& url,
const NavigationEntry::SSLStatus& ssl, const NavigationEntry::SSLStatus& ssl,
bool show_history); bool show_history) OVERRIDE;
virtual void ShowAppMenu(); virtual void ShowAppMenu() OVERRIDE;
virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
bool* is_keyboard_shortcut); bool* is_keyboard_shortcut) OVERRIDE;
virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); virtual void HandleKeyboardEvent(
const NativeWebKeyboardEvent& event) OVERRIDE;
virtual void ShowCreateWebAppShortcutsDialog( virtual void ShowCreateWebAppShortcutsDialog(
TabContentsWrapper* tab_contents); TabContentsWrapper* tab_contents) OVERRIDE;
virtual void ShowCreateChromeAppShortcutsDialog(Profile* profile, virtual void ShowCreateChromeAppShortcutsDialog(
const Extension* app); Profile* profile,
virtual void Cut(); const Extension* app) OVERRIDE;
virtual void Copy(); virtual void Cut() OVERRIDE;
virtual void Paste(); virtual void Copy() OVERRIDE;
virtual void ShowInstant(TabContentsWrapper* preview); virtual void Paste() OVERRIDE;
virtual void HideInstant(); virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE;
virtual gfx::Rect GetInstantBounds(); virtual void HideInstant() OVERRIDE;
virtual gfx::Rect GetInstantBounds() OVERRIDE;
virtual WindowOpenDisposition GetDispositionForPopupBounds( virtual WindowOpenDisposition GetDispositionForPopupBounds(
const gfx::Rect& bounds); const gfx::Rect& bounds) OVERRIDE;
virtual FindBar* CreateFindBar() OVERRIDE; virtual FindBar* CreateFindBar() OVERRIDE;
virtual void ShowAvatarBubble(TabContents* tab_contents, virtual void ShowAvatarBubble(TabContents* tab_contents,
const gfx::Rect& rect) OVERRIDE; const gfx::Rect& rect) OVERRIDE;
...@@ -156,22 +162,22 @@ class BrowserWindowGtk : public BrowserWindow, ...@@ -156,22 +162,22 @@ class BrowserWindowGtk : public BrowserWindow,
// Overridden from NotificationObserver: // Overridden from NotificationObserver:
virtual void Observe(int type, virtual void Observe(int type,
const content::NotificationSource& source, const content::NotificationSource& source,
const content::NotificationDetails& details); const content::NotificationDetails& details) OVERRIDE;
// Overridden from TabStripModelObserver: // Overridden from TabStripModelObserver:
virtual void TabDetachedAt(TabContentsWrapper* contents, int index); virtual void TabDetachedAt(TabContentsWrapper* contents, int index) OVERRIDE;
virtual void ActiveTabChanged(TabContentsWrapper* old_contents, virtual void ActiveTabChanged(TabContentsWrapper* old_contents,
TabContentsWrapper* new_contents, TabContentsWrapper* new_contents,
int index, int index,
bool user_gesture); bool user_gesture) OVERRIDE;
// Overridden from ActiveWindowWatcher::Observer. // Overridden from ActiveWindowWatcher::Observer.
virtual void ActiveWindowChanged(GdkWindow* active_window); virtual void ActiveWindowChanged(GdkWindow* active_window) OVERRIDE;
// Overridden from InfoBarContainer::Delegate: // Overridden from InfoBarContainer::Delegate:
virtual SkColor GetInfoBarSeparatorColor() const; virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE;
virtual void InfoBarContainerStateChanged(bool is_animating); virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE;
virtual bool DrawInfoBarArrows(int* x) const; virtual bool DrawInfoBarArrows(int* x) const OVERRIDE;
// Accessor for the tab strip. // Accessor for the tab strip.
TabStripGtk* tabstrip() const { return tabstrip_.get(); } TabStripGtk* tabstrip() const { return tabstrip_.get(); }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment