diff options
31 files changed, 180 insertions, 142 deletions
diff --git a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h b/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h index 245c338..299c627 100644 --- a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h +++ b/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_TOUCH_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_ #pragma once +#include "base/compiler_specific.h" #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h" @@ -50,18 +51,18 @@ class TouchAutocompletePopupContentsView virtual ~TouchAutocompletePopupContentsView(); // AutocompletePopupContentsView: - virtual void UpdatePopupAppearance(); - virtual void LayoutChildren(); + virtual void UpdatePopupAppearance() OVERRIDE; + virtual void LayoutChildren() OVERRIDE; protected: // AutocompletePopupContentsView: - virtual void PaintResultViews(gfx::CanvasSkia* canvas); - virtual int CalculatePopupHeight(); + virtual void PaintResultViews(gfx::CanvasSkia* canvas) OVERRIDE; + virtual int CalculatePopupHeight() OVERRIDE; virtual AutocompleteResultView* CreateResultView( AutocompleteResultViewModel* model, int model_index, const gfx::Font& font, - const gfx::Font& bold_font); + const gfx::Font& bold_font) OVERRIDE; private: std::vector<View*> GetVisibleChildren(); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h index 82ddf61..3f6ffea 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_ #pragma once +#include "base/compiler_specific.h" #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h" #include "views/controls/menu/menu_delegate.h" @@ -53,19 +54,19 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerViewsDelegate, void SetPageNavigator(PageNavigator* navigator); // Overridden from views::MenuDelegate: - virtual void ExecuteCommand(int command_id); - virtual bool IsItemChecked(int command_id) const; - virtual bool IsCommandEnabled(int command_id) const; - virtual bool ShouldCloseAllMenusOnExecute(int id); + virtual void ExecuteCommand(int command_id) OVERRIDE; + virtual bool IsItemChecked(int command_id) const OVERRIDE; + virtual bool IsCommandEnabled(int command_id) const OVERRIDE; + virtual bool ShouldCloseAllMenusOnExecute(int id) OVERRIDE; // Overridden from BookmarkContextMenuControllerViewsDelegate: - virtual void CloseMenu(); - virtual void AddItemWithStringId(int command_id, int string_id); - virtual void AddSeparator(); - virtual void AddCheckboxItem(int command_id, int string_id); + virtual void CloseMenu() OVERRIDE; + virtual void AddItemWithStringId(int command_id, int string_id) OVERRIDE; + virtual void AddSeparator() OVERRIDE; + virtual void AddCheckboxItem(int command_id, int string_id) OVERRIDE; virtual void WillRemoveBookmarks( - const std::vector<const BookmarkNode*>& bookmarks); - virtual void DidRemoveBookmarks(); + const std::vector<const BookmarkNode*>& bookmarks) OVERRIDE; + virtual void DidRemoveBookmarks() OVERRIDE; private: scoped_ptr<BookmarkContextMenuControllerViews> controller_; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h index cb9f572..dff393d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h @@ -8,6 +8,7 @@ #include <set> +#include "base/compiler_specific.h" #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "views/controls/menu/menu_delegate.h" @@ -75,40 +76,40 @@ class BookmarkMenuController : public BaseBookmarkModelObserver, // MenuDelegate methods. virtual string16 GetTooltipText(int id, const gfx::Point& p) const OVERRIDE; virtual bool IsTriggerableEvent(views::MenuItemView* view, - const views::MouseEvent& e); - virtual void ExecuteCommand(int id, int mouse_event_flags); + const views::MouseEvent& e) OVERRIDE; + virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE; virtual bool GetDropFormats( views::MenuItemView* menu, int* formats, - std::set<ui::OSExchangeData::CustomFormat>* custom_formats); - virtual bool AreDropTypesRequired(views::MenuItemView* menu); + std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; + virtual bool AreDropTypesRequired(views::MenuItemView* menu) OVERRIDE; virtual bool CanDrop(views::MenuItemView* menu, - const ui::OSExchangeData& data); + const ui::OSExchangeData& data) OVERRIDE; virtual int GetDropOperation(views::MenuItemView* item, const views::DropTargetEvent& event, - DropPosition* position); + DropPosition* position) OVERRIDE; virtual int OnPerformDrop(views::MenuItemView* menu, DropPosition position, - const views::DropTargetEvent& event); + const views::DropTargetEvent& event) OVERRIDE; virtual bool ShowContextMenu(views::MenuItemView* source, int id, const gfx::Point& p, - bool is_mouse_gesture); - virtual void DropMenuClosed(views::MenuItemView* menu); - virtual bool CanDrag(views::MenuItemView* menu); + bool is_mouse_gesture) OVERRIDE; + virtual void DropMenuClosed(views::MenuItemView* menu) OVERRIDE; + virtual bool CanDrag(views::MenuItemView* menu) OVERRIDE; virtual void WriteDragData(views::MenuItemView* sender, - ui::OSExchangeData* data); - virtual int GetDragOperations(views::MenuItemView* sender); + ui::OSExchangeData* data) OVERRIDE; + virtual int GetDragOperations(views::MenuItemView* sender) OVERRIDE; virtual views::MenuItemView* GetSiblingMenu( views::MenuItemView* menu, const gfx::Point& screen_point, views::MenuItemView::AnchorPosition* anchor, bool* has_mnemonics, - views::MenuButton** button); - virtual int GetMaxWidthForMenu(views::MenuItemView* view); + views::MenuButton** button) OVERRIDE; + virtual int GetMaxWidthForMenu(views::MenuItemView* view) OVERRIDE; // BookmarkModelObserver methods. - virtual void BookmarkModelChanged(); + virtual void BookmarkModelChanged() OVERRIDE; private: // BookmarkMenuController deletes itself as necessary. diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h index d27576b..0480eaa 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h @@ -9,6 +9,7 @@ #include <map> #include <set> +#include "base/compiler_specific.h" #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -119,8 +120,8 @@ class BookmarkMenuDelegate : public BaseBookmarkModelObserver, // BookmarkContextMenu::Observer methods. virtual void WillRemoveBookmarks( - const std::vector<const BookmarkNode*>& bookmarks); - virtual void DidRemoveBookmarks(); + const std::vector<const BookmarkNode*>& bookmarks) OVERRIDE; + virtual void DidRemoveBookmarks() OVERRIDE; private: typedef std::map<int, const BookmarkNode*> MenuIDToNodeMap; diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index 262b271..0e671b8 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -404,10 +404,12 @@ class BrowserActionsContainer static int IconHeight(); // ExtensionToolbarModel::Observer implementation. - virtual void BrowserActionAdded(const Extension* extension, int index); - virtual void BrowserActionRemoved(const Extension* extension); - virtual void BrowserActionMoved(const Extension* extension, int index); - virtual void ModelLoaded(); + virtual void BrowserActionAdded(const Extension* extension, + int index) OVERRIDE; + virtual void BrowserActionRemoved(const Extension* extension) OVERRIDE; + virtual void BrowserActionMoved(const Extension* extension, + int index) OVERRIDE; + virtual void ModelLoaded() OVERRIDE; void LoadImages(); diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h index c02a921..cf2444e 100644 --- a/chrome/browser/ui/views/bubble/bubble.h +++ b/chrome/browser/ui/views/bubble/bubble.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_BUBBLE_BUBBLE_H_ #pragma once +#include "base/compiler_specific.h" #include "base/observer_list.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/models/accelerator.h" @@ -143,11 +144,11 @@ class Bubble } // Overridden from NativeWidget: - virtual void Close(); + virtual void Close() OVERRIDE; // Overridden from ui::AnimationDelegate: - virtual void AnimationEnded(const ui::Animation* animation); - virtual void AnimationProgressed(const ui::Animation* animation); + virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; #ifdef UNIT_TEST views::View* contents() const { return contents_; } @@ -188,7 +189,7 @@ class Bubble virtual void OnLostActive() OVERRIDE; #elif defined(OS_WIN) // Overridden from NativeWidgetWin: - virtual void OnActivate(UINT action, BOOL minimized, HWND window); + virtual void OnActivate(UINT action, BOOL minimized, HWND window) OVERRIDE; #elif defined(TOOLKIT_USES_GTK) // Overridden from NativeWidgetGtk: virtual void OnActiveChanged() OVERRIDE; @@ -225,7 +226,7 @@ class Bubble void UnregisterEscapeAccelerator(); // Overridden from AcceleratorTarget: - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator); + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // The delegate, if any. BubbleDelegate* delegate_; diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.h b/chrome/browser/ui/views/content_setting_bubble_contents.h index 23e7902..7a83509 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.h +++ b/chrome/browser/ui/views/content_setting_bubble_contents.h @@ -49,7 +49,7 @@ class ContentSettingBubbleContents : public views::BubbleDelegateView, views::BubbleBorder::ArrowLocation arrow_location); virtual ~ContentSettingBubbleContents(); - virtual gfx::Size GetPreferredSize(); + virtual gfx::Size GetPreferredSize() OVERRIDE; // views::BubbleDelegateView: virtual gfx::Point GetAnchorPoint() OVERRIDE; diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h index b55adcc..3220bf9 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.h +++ b/chrome/browser/ui/views/create_application_shortcut_view.h @@ -82,7 +82,7 @@ class CreateUrlApplicationShortcutView : public CreateApplicationShortcutView { explicit CreateUrlApplicationShortcutView(TabContentsWrapper* tab_contents); virtual ~CreateUrlApplicationShortcutView(); - virtual bool Accept(); + virtual bool Accept() OVERRIDE; private: // Fetch the largest unprocessed icon. @@ -118,7 +118,7 @@ class CreateChromeApplicationShortcutView // it to the "Create Shortcut" dailog box. virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource, - int index); + int index) OVERRIDE; private: const Extension* app_; diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h index 98a8936..e848e42 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.h +++ b/chrome/browser/ui/views/dropdown_bar_host.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_DROPDOWN_BAR_HOST_H_ #pragma once +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/native_web_keyboard_event.h" #include "ui/base/animation/animation_delegate.h" @@ -80,8 +81,8 @@ class DropdownBarHost : public ui::AcceleratorTarget, virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) = 0; // ui::AnimationDelegate implementation: - virtual void AnimationProgressed(const ui::Animation* animation); - virtual void AnimationEnded(const ui::Animation* animation); + virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; + virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; // During testing we can disable animations by setting this flag to true, // so that opening and closing the dropdown bar is shown instantly, instead of diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h index 9a83432..7142e7a 100644 --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h @@ -9,6 +9,7 @@ #include <set> #include <vector> +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/task.h" #include "views/controls/menu/menu_delegate.h" @@ -47,31 +48,33 @@ class BrowserActionOverflowMenuController : public views::MenuDelegate { void CancelMenu(); // Overridden from views::MenuDelegate: - virtual void ExecuteCommand(int id); + virtual void ExecuteCommand(int id) OVERRIDE; virtual bool ShowContextMenu(views::MenuItemView* source, int id, const gfx::Point& p, - bool is_mouse_gesture); - virtual void DropMenuClosed(views::MenuItemView* menu); + bool is_mouse_gesture) OVERRIDE; + virtual void DropMenuClosed(views::MenuItemView* menu) OVERRIDE; // These drag functions offer support for dragging icons into the overflow // menu. virtual bool GetDropFormats( views::MenuItemView* menu, int* formats, - std::set<ui::OSExchangeData::CustomFormat>* custom_formats); - virtual bool AreDropTypesRequired(views::MenuItemView* menu); - virtual bool CanDrop(views::MenuItemView* menu, const ui::OSExchangeData& data); + std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; + virtual bool AreDropTypesRequired(views::MenuItemView* menu) OVERRIDE; + virtual bool CanDrop(views::MenuItemView* menu, + const ui::OSExchangeData& data) OVERRIDE; virtual int GetDropOperation(views::MenuItemView* item, const views::DropTargetEvent& event, - DropPosition* position); + DropPosition* position) OVERRIDE; virtual int OnPerformDrop(views::MenuItemView* menu, DropPosition position, - const views::DropTargetEvent& event); + const views::DropTargetEvent& event) OVERRIDE; // These three drag functions offer support for dragging icons out of the // overflow menu. - virtual bool CanDrag(views::MenuItemView* menu); - virtual void WriteDragData(views::MenuItemView* sender, ui::OSExchangeData* data); - virtual int GetDragOperations(views::MenuItemView* sender); + virtual bool CanDrag(views::MenuItemView* menu) OVERRIDE; + virtual void WriteDragData(views::MenuItemView* sender, + ui::OSExchangeData* data) OVERRIDE; + virtual int GetDragOperations(views::MenuItemView* sender) OVERRIDE; private: // This class manages its own lifetime. diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h index 61c574e..6a86ff5 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.h +++ b/chrome/browser/ui/views/extensions/extension_popup.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_ #pragma once +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/ui/views/browser_bubble.h" @@ -68,22 +69,22 @@ class ExtensionPopup : public BrowserBubble, ExtensionHost* host() const { return extension_host_.get(); } // BrowserBubble overrides. - virtual void Show(bool activate); + virtual void Show(bool activate) OVERRIDE; // BrowserBubble::Delegate methods. - virtual void BubbleBrowserWindowMoved(BrowserBubble* bubble); - virtual void BubbleBrowserWindowClosing(BrowserBubble* bubble); - virtual void BubbleGotFocus(BrowserBubble* bubble); + virtual void BubbleBrowserWindowMoved(BrowserBubble* bubble) OVERRIDE; + virtual void BubbleBrowserWindowClosing(BrowserBubble* bubble) OVERRIDE; + virtual void BubbleGotFocus(BrowserBubble* bubble) OVERRIDE; virtual void BubbleLostFocus(BrowserBubble* bubble, - bool lost_focus_to_child); + bool lost_focus_to_child) OVERRIDE; // content::NotificationObserver overrides. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // ExtensionView::Container overrides. - virtual void OnExtensionPreferredSizeChanged(ExtensionView* view); + virtual void OnExtensionPreferredSizeChanged(ExtensionView* view) OVERRIDE; // The min/max height of popups. static const int kMinWidth; diff --git a/chrome/browser/ui/views/find_bar_host.h b/chrome/browser/ui/views/find_bar_host.h index ee593d7..f6d18d2 100644 --- a/chrome/browser/ui/views/find_bar_host.h +++ b/chrome/browser/ui/views/find_bar_host.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_HOST_H_ #pragma once +#include "base/compiler_specific.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/views/dropdown_bar_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" @@ -47,33 +48,34 @@ class FindBarHost : public DropdownBarHost, bool MaybeForwardKeyEventToWebpage(const views::KeyEvent& key_event); // FindBar implementation: - virtual FindBarController* GetFindBarController() const; - virtual void SetFindBarController(FindBarController* find_bar_controller); - virtual void Show(bool animate); - virtual void Hide(bool animate); - virtual void SetFocusAndSelection(); - virtual void ClearResults(const FindNotificationDetails& results); - virtual void StopAnimation(); + virtual FindBarController* GetFindBarController() const OVERRIDE; + virtual void SetFindBarController( + FindBarController* find_bar_controller) OVERRIDE; + virtual void Show(bool animate) OVERRIDE; + virtual void Hide(bool animate) OVERRIDE; + virtual void SetFocusAndSelection() OVERRIDE; + virtual void ClearResults(const FindNotificationDetails& results) OVERRIDE; + virtual void StopAnimation() OVERRIDE; virtual void MoveWindowIfNecessary(const gfx::Rect& selection_rect, - bool no_redraw); - virtual void SetFindText(const string16& find_text); + bool no_redraw) OVERRIDE; + virtual void SetFindText(const string16& find_text) OVERRIDE; virtual void UpdateUIForFindResult(const FindNotificationDetails& result, - const string16& find_text); - virtual void AudibleAlert(); - virtual bool IsFindBarVisible(); - virtual void RestoreSavedFocus(); - virtual FindBarTesting* GetFindBarTesting(); + const string16& find_text) OVERRIDE; + virtual void AudibleAlert() OVERRIDE; + virtual bool IsFindBarVisible() OVERRIDE; + virtual void RestoreSavedFocus() OVERRIDE; + virtual FindBarTesting* GetFindBarTesting() OVERRIDE; // Overridden from ui::AcceleratorTarget in DropdownBarHost class: - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator); + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // FindBarTesting implementation: virtual bool GetFindBarWindowInfo(gfx::Point* position, - bool* fully_visible); - virtual string16 GetFindText(); - virtual string16 GetFindSelectedText(); - virtual string16 GetMatchCountText(); - virtual int GetWidth(); + bool* fully_visible) OVERRIDE; + virtual string16 GetFindText() OVERRIDE; + virtual string16 GetFindSelectedText() OVERRIDE; + virtual string16 GetMatchCountText() OVERRIDE; + virtual int GetWidth() OVERRIDE; // Overridden from DropdownBarHost: // Returns the rectangle representing where to position the find bar. It uses @@ -87,13 +89,15 @@ class FindBarHost : public DropdownBarHost, // the top of the page area, (it will be converted to coordinates relative to // the top of the browser window, when comparing against the dialog // coordinates). The returned value is relative to the browser window. - virtual gfx::Rect GetDialogPosition(gfx::Rect avoid_overlapping_rect); + virtual gfx::Rect GetDialogPosition( + gfx::Rect avoid_overlapping_rect) OVERRIDE; // Moves the dialog window to the provided location, moves it to top in the // z-order (HWND_TOP, not HWND_TOPMOST) and shows the window (if hidden). // It then calls UpdateWindowEdges to make sure we don't overwrite the Chrome // window border. If |no_redraw| is set, the window is getting moved but not // sized, and should not be redrawn to reduce update flicker. - virtual void SetDialogPosition(const gfx::Rect& new_pos, bool no_redraw); + virtual void SetDialogPosition(const gfx::Rect& new_pos, + bool no_redraw) OVERRIDE; // Retrieves the boundaries that the find bar widget has to work with // within the Chrome frame window. The resulting rectangle will be a @@ -106,11 +110,11 @@ class FindBarHost : public DropdownBarHost, // window. If the function fails to determine the browser // window/client area rectangle or the rectangle for the page area // then |bounds| will be an empty rectangle. - virtual void GetWidgetBounds(gfx::Rect* bounds); + virtual void GetWidgetBounds(gfx::Rect* bounds) OVERRIDE; // Additional accelerator handling (on top of what DropDownBarHost does). - virtual void RegisterAccelerators(); - virtual void UnregisterAccelerators(); + virtual void RegisterAccelerators() OVERRIDE; + virtual void UnregisterAccelerators() OVERRIDE; private: // Allows implementation to tweak widget position. diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h index 6b071fa..86d9cb3 100644 --- a/chrome/browser/ui/views/find_bar_view.h +++ b/chrome/browser/ui/views/find_bar_view.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_ #pragma once +#include "base/compiler_specific.h" #include "base/string16.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" #include "chrome/browser/ui/views/dropdown_bar_view.h" @@ -63,31 +64,32 @@ class FindBarView : public DropdownBarView, void ClearMatchCount(); // Claims focus for the text field and selects its contents. - virtual void SetFocusAndSelection(bool select_all); + virtual void SetFocusAndSelection(bool select_all) OVERRIDE; // views::View: - virtual void OnPaint(gfx::Canvas* canvas); - virtual void Layout(); - virtual gfx::Size GetPreferredSize(); + virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual void Layout() OVERRIDE; + virtual gfx::Size GetPreferredSize() OVERRIDE; virtual void ViewHierarchyChanged(bool is_add, views::View* parent, - views::View* child); + views::View* child) OVERRIDE; // views::ButtonListener: - virtual void ButtonPressed(views::Button* sender, const views::Event& event); + virtual void ButtonPressed(views::Button* sender, + const views::Event& event) OVERRIDE; // views::TextfieldController: virtual void ContentsChanged(views::Textfield* sender, - const string16& new_contents); + const string16& new_contents) OVERRIDE; virtual bool HandleKeyEvent(views::Textfield* sender, - const views::KeyEvent& key_event); + const views::KeyEvent& key_event) OVERRIDE; private: // Update the appearance for the match count label. void UpdateMatchCountAppearance(bool no_match); // Overridden from views::View. - virtual void OnThemeChanged(); + virtual void OnThemeChanged() OVERRIDE; // We use a hidden view to grab mouse clicks and bring focus to the find // text box. This is because although the find text box may look like it @@ -102,7 +104,7 @@ class FindBarView : public DropdownBarView, : view_to_focus_on_mousedown_(view_to_focus_on_mousedown) {} private: - virtual bool OnMousePressed(const views::MouseEvent& event); + virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; views::Textfield* view_to_focus_on_mousedown_; @@ -116,7 +118,7 @@ class FindBarView : public DropdownBarView, SearchTextfieldView(); virtual ~SearchTextfieldView(); - virtual void RequestFocus(); + virtual void RequestFocus() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(SearchTextfieldView); diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index db0eda9..6d66f36 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -10,6 +10,7 @@ #include <string> #include <vector> +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "build/build_config.h" @@ -164,7 +165,7 @@ class BrowserView : public BrowserBubbleHost, virtual bool ShouldShowAvatar() const; // Handle the specified |accelerator| being pressed. - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator); + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // Provides the containing frame with the accelerator for the specified // command id. This can be used to provide menu item shortcut hints etc. @@ -227,7 +228,7 @@ class BrowserView : public BrowserBubbleHost, bool IsPositionInWindowCaption(const gfx::Point& point); // Returns whether the fullscreen bubble is visible or not. - virtual bool IsFullscreenBubbleVisible() const; + virtual bool IsFullscreenBubbleVisible() const OVERRIDE; // Invoked from the frame when the full screen state changes. This is only // used on Linux. diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h index 3f4ab31..5ddc152 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.h +++ b/chrome/browser/ui/views/frame/browser_view_layout.h @@ -7,6 +7,7 @@ #pragma once #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "ui/gfx/rect.h" #include "ui/views/layout/layout_manager.h" @@ -51,12 +52,12 @@ class BrowserViewLayout : public views::LayoutManager { virtual int NonClientHitTest(const gfx::Point& point); // views::LayoutManager overrides: - virtual void Installed(views::View* host); - virtual void Uninstalled(views::View* host); - virtual void ViewAdded(views::View* host, views::View* view); - virtual void ViewRemoved(views::View* host, views::View* view); - virtual void Layout(views::View* host); - virtual gfx::Size GetPreferredSize(views::View* host); + virtual void Installed(views::View* host) OVERRIDE; + virtual void Uninstalled(views::View* host) OVERRIDE; + virtual void ViewAdded(views::View* host, views::View* view) OVERRIDE; + virtual void ViewRemoved(views::View* host, views::View* view) OVERRIDE; + virtual void Layout(views::View* host) OVERRIDE; + virtual gfx::Size GetPreferredSize(views::View* host) OVERRIDE; protected: Browser* browser(); diff --git a/chrome/browser/ui/views/infobars/extension_infobar.h b/chrome/browser/ui/views/infobars/extension_infobar.h index 6aeb2ca..99d1258 100644 --- a/chrome/browser/ui/views/infobars/extension_infobar.h +++ b/chrome/browser/ui/views/infobars/extension_infobar.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_ #pragma once +#include "base/compiler_specific.h" #include "chrome/browser/extensions/extension_infobar_delegate.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/ui/views/infobars/infobar_view.h" @@ -38,13 +39,13 @@ class ExtensionInfoBar : public InfoBarView, // ImageLoadingTracker::Observer: virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource, - int index); + int index) OVERRIDE; // ExtensionInfoBarDelegate::DelegateObserver: - virtual void OnDelegateDeleted(); + virtual void OnDelegateDeleted() OVERRIDE; // views::ViewMenuDelegate: - virtual void RunMenu(View* source, const gfx::Point& pt); + virtual void RunMenu(View* source, const gfx::Point& pt) OVERRIDE; ExtensionInfoBarDelegate* GetDelegate(); diff --git a/chrome/browser/ui/views/infobars/infobar_background.h b/chrome/browser/ui/views/infobars/infobar_background.h index 4f9cc1e..7101f20 100644 --- a/chrome/browser/ui/views/infobars/infobar_background.h +++ b/chrome/browser/ui/views/infobars/infobar_background.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_BACKGROUND_H_ #pragma once +#include "base/compiler_specific.h" #include "chrome/browser/infobars/infobar_delegate.h" #include "views/background.h" @@ -18,7 +19,7 @@ class InfoBarBackground : public views::Background { private: // views::Background: - virtual void Paint(gfx::Canvas* canvas, views::View* view) const; + virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE; SkColor separator_color_; SkColor top_color_; diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.h b/chrome/browser/ui/views/infobars/translate_infobar_base.h index 6e1ebfd..04028b8 100644 --- a/chrome/browser/ui/views/infobars/translate_infobar_base.h +++ b/chrome/browser/ui/views/infobars/translate_infobar_base.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_TRANSLATE_INFOBAR_BASE_H_ #pragma once +#include "base/compiler_specific.h" #include "chrome/browser/translate/languages_menu_model.h" #include "chrome/browser/translate/translate_infobar_view.h" #include "chrome/browser/ui/views/infobars/infobar_background.h" @@ -30,7 +31,9 @@ class TranslateInfoBarBase : public TranslateInfoBarView, static const int kButtonInLabelSpacing; // InfoBarView: - virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child); + virtual void ViewHierarchyChanged(bool is_add, + View* parent, + View* child) OVERRIDE; // Sets the text of the provided language menu button to reflect the current // value from the delegate. @@ -42,8 +45,8 @@ class TranslateInfoBarBase : public TranslateInfoBarView, private: // InfoBarView: - virtual void OnPaintBackground(gfx::Canvas* canvas); - virtual void AnimationProgressed(const ui::Animation* animation); + virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; + virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; // Returns the background that should be displayed when not animating. const views::Background& GetBackground(); diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.h b/chrome/browser/ui/views/keyboard_overlay_dialog_view.h index 632c708..2b88117 100644 --- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.h +++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.h @@ -8,6 +8,7 @@ #include <set> +#include "base/compiler_specific.h" #include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/browser/ui/views/html_dialog_view.h" @@ -27,7 +28,7 @@ class KeyboardOverlayDialogView : public HtmlDialogView { virtual ~KeyboardOverlayDialogView(); // Overridden from views::View: - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator); + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; // Shows the keyboard overlay. static void ShowDialog(gfx::NativeWindow owning_window, BrowserView* parent); diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h index 5f6a339..4731cfb 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ #pragma once +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "chrome/common/content_settings_types.h" @@ -35,7 +36,7 @@ class ContentSettingImageView : public views::ImageView, void UpdateFromTabContents(TabContents* tab_contents); // views::View overrides: - virtual gfx::Size GetPreferredSize(); + virtual gfx::Size GetPreferredSize() OVERRIDE; private: // views::ImageView overrides: diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.h b/chrome/browser/ui/views/location_bar/keyword_hint_view.h index 0a928b5..1a18fe8 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.h +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.h @@ -8,6 +8,7 @@ #include <string> +#include "base/compiler_specific.h" #include "ui/gfx/size.h" #include "views/view.h" @@ -37,11 +38,11 @@ class KeywordHintView : public views::View { void SetKeyword(const string16& keyword); string16 keyword() const { return keyword_; } - virtual void OnPaint(gfx::Canvas* canvas); - virtual gfx::Size GetPreferredSize(); + virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() OVERRIDE; // The minimum size is just big enough to show the tab. - virtual gfx::Size GetMinimumSize(); - virtual void Layout(); + virtual gfx::Size GetMinimumSize() OVERRIDE; + virtual void Layout() OVERRIDE; private: views::Label* CreateLabel(); diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h index 06f145d..a988f7a 100644 --- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h +++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_ #pragma once +#include "base/compiler_specific.h" #include "ui/gfx/size.h" #include "views/view.h" @@ -27,7 +28,7 @@ class PageActionWithBadgeView : public views::View { void UpdateVisibility(TabContents* contents, const GURL& url); private: - virtual void Layout(); + virtual void Layout() OVERRIDE; // The button this view contains. PageActionImageView* image_view_; diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.h b/chrome/browser/ui/views/location_bar/selected_keyword_view.h index d4b714a..ad4e2e1 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.h +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.h @@ -8,6 +8,7 @@ #include <string> +#include "base/compiler_specific.h" #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" #include "views/controls/label.h" @@ -28,9 +29,9 @@ class SelectedKeywordView : public IconLabelBubbleView { void SetFont(const gfx::Font& font); - virtual gfx::Size GetPreferredSize(); - virtual gfx::Size GetMinimumSize(); - virtual void Layout(); + virtual gfx::Size GetPreferredSize() OVERRIDE; + virtual gfx::Size GetMinimumSize() OVERRIDE; + virtual void Layout() OVERRIDE; // The current keyword, or an empty string if no keyword is displayed. void SetKeyword(const string16& keyword); diff --git a/chrome/browser/ui/views/location_bar/suggested_text_view.h b/chrome/browser/ui/views/location_bar/suggested_text_view.h index c64af82..91a1f4f 100644 --- a/chrome/browser/ui/views/location_bar/suggested_text_view.h +++ b/chrome/browser/ui/views/location_bar/suggested_text_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_SUGGESTED_TEXT_VIEW_H_ #pragma once +#include "base/compiler_specific.h" #include "ui/base/animation/animation_delegate.h" #include "views/controls/label.h" @@ -30,12 +31,12 @@ class SuggestedTextView : public views::Label, void StopAnimation(); // View overrides: - virtual void OnPaintBackground(gfx::Canvas* canvas); + virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; // AnimationDelegate overrides: - virtual void AnimationEnded(const ui::Animation* animation); - virtual void AnimationProgressed(const ui::Animation* animation); - virtual void AnimationCanceled(const ui::Animation* animation); + virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; + virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; + virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE; private: // Creates the animation to use. diff --git a/chrome/browser/ui/views/page_info_bubble_view.h b/chrome/browser/ui/views/page_info_bubble_view.h index 4723211..dc11086 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.h +++ b/chrome/browser/ui/views/page_info_bubble_view.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_BUBBLE_VIEW_H_ #pragma once +#include "base/compiler_specific.h" #include "chrome/browser/page_info_model.h" #include "chrome/browser/page_info_model_observer.h" #include "ui/base/animation/slide_animation.h" @@ -27,7 +28,7 @@ class PageInfoBubbleView : public views::BubbleDelegateView, void ShowCertDialog(); // views::View methods: - virtual gfx::Size GetPreferredSize(); + virtual gfx::Size GetPreferredSize() OVERRIDE; // PageInfoModelObserver methods: virtual void OnPageInfoModelChanged() OVERRIDE; diff --git a/chrome/browser/ui/views/select_file_dialog_extension.h b/chrome/browser/ui/views/select_file_dialog_extension.h index fe72ff7..2d91cb2 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension.h +++ b/chrome/browser/ui/views/select_file_dialog_extension.h @@ -8,6 +8,7 @@ #include <map> +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ui/select_file_dialog.h" #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h" @@ -75,7 +76,7 @@ class SelectFileDialogExtension static bool PendingExists(int32 tab_id); // Returns if the dialog has mutiple file type choices - virtual bool HasMultipleFileTypeChoicesImpl(); + virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE; bool hasMultipleFileTypeChoices_; void* params_; diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h index 0e6a766..8af2bf3 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_VIEWS_H_ #pragma once +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" @@ -69,8 +70,8 @@ class TabContentsViewViews : public views::Widget, virtual void RestoreFocus() OVERRIDE; virtual bool IsDoingDrag() const OVERRIDE; virtual void CancelDragAndCloseTab() OVERRIDE; - virtual bool IsEventTracking() const; - virtual void CloseTabAfterEventTracking(); + virtual bool IsEventTracking() const OVERRIDE; + virtual void CloseTabAfterEventTracking() OVERRIDE; virtual void GetViewBounds(gfx::Rect* out) const OVERRIDE; virtual void InstallOverlayView(gfx::NativeView view) OVERRIDE; virtual void RemoveOverlayView() OVERRIDE; diff --git a/chrome/browser/ui/views/tab_icon_view.h b/chrome/browser/ui/views/tab_icon_view.h index 428582f..ef49649 100644 --- a/chrome/browser/ui/views/tab_icon_view.h +++ b/chrome/browser/ui/views/tab_icon_view.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TAB_ICON_VIEW_H_ #pragma once +#include "base/compiler_specific.h" #include "views/view.h" class SkBitmap; @@ -39,8 +40,8 @@ class TabIconView : public views::View { void set_is_light(bool is_light) { is_light_ = is_light; } // Overridden from View - virtual void OnPaint(gfx::Canvas* canvas); - virtual gfx::Size GetPreferredSize(); + virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + virtual gfx::Size GetPreferredSize() OVERRIDE; private: void PaintThrobber(gfx::Canvas* canvas); diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h index e7e0093..9e94d244 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ #pragma once +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/hover_tab_selector.h" @@ -43,7 +44,7 @@ class BrowserTabStripController : public TabStripController, virtual const TabStripSelectionModel& GetSelectionModel() OVERRIDE; virtual int GetCount() const OVERRIDE; virtual bool IsValidIndex(int model_index) const OVERRIDE; - virtual bool IsActiveTab(int model_index) const; + virtual bool IsActiveTab(int model_index) const OVERRIDE; virtual bool IsTabSelected(int model_index) const OVERRIDE; virtual bool IsTabPinned(int model_index) const OVERRIDE; virtual bool IsTabCloseable(int model_index) const OVERRIDE; diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index 269a2b8..453160a 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ #pragma once +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/timer.h" #include "chrome/browser/ui/views/tabs/base_tab_strip.h" @@ -215,11 +216,11 @@ class TabStrip : public BaseTabStrip, // animating to their desired position/bounds. This is used by the standard // Layout method and other callers like the DraggedTabController that need // stable representations of Tab positions. - virtual void GenerateIdealBounds(); + virtual void GenerateIdealBounds() OVERRIDE; // Starts various types of TabStrip animations. void StartResizeLayoutAnimation(); - virtual void StartMiniTabAnimation(); + virtual void StartMiniTabAnimation() OVERRIDE; void StartMouseInitiatedRemoveTabAnimation(int model_index); // Returns true if the specified point in TabStrip coords is within the diff --git a/chrome/browser/ui/views/theme_background.h b/chrome/browser/ui/views/theme_background.h index 6e32b1a7..ad491b5 100644 --- a/chrome/browser/ui/views/theme_background.h +++ b/chrome/browser/ui/views/theme_background.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_THEME_BACKGROUND_H_ #pragma once +#include "base/compiler_specific.h" #include "views/background.h" class BrowserView; @@ -30,7 +31,7 @@ class ThemeBackground : public views::Background { virtual ~ThemeBackground() {} // Overridden from views:;Background. - virtual void Paint(gfx::Canvas* canvas, views::View* view) const; + virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE; private: BrowserView* browser_view_; |