Linux/ChromeOS Chromium style checker cleanup, chrome/browser/ui edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
Review URL: https://chromiumcodereview.appspot.com/12209032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181008 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc
index b54a10a..9616014c 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -127,7 +127,7 @@
private:
// gfx::CanvasImageSource overrides:
- void Draw(gfx::Canvas* canvas) OVERRIDE {
+ virtual void Draw(gfx::Canvas* canvas) OVERRIDE {
using extension_misc::EXTENSION_ICON_SMALL;
using extension_misc::EXTENSION_ICON_MEDIUM;
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index 7f3b6fb..614bd34 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -55,7 +55,7 @@
return ash::test::ShellTestApi(ash::Shell::GetInstance()).launcher_model();
}
- virtual void RunTestOnMainThreadLoop() {
+ virtual void RunTestOnMainThreadLoop() OVERRIDE {
launcher_ = ash::Launcher::ForPrimaryDisplay();
controller_ = static_cast<ChromeLauncherController*>(launcher_->delegate());
return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
@@ -84,7 +84,7 @@
virtual ~LauncherAppBrowserTest() {}
- virtual void RunTestOnMainThreadLoop() {
+ virtual void RunTestOnMainThreadLoop() OVERRIDE {
launcher_ = ash::Launcher::ForPrimaryDisplay();
model_ =
ash::test::ShellTestApi(ash::Shell::GetInstance()).launcher_model();
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc
index 8dbbd302..4838292 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc
@@ -63,7 +63,7 @@
return ash::test::ShellTestApi(ash::Shell::GetInstance()).launcher_model();
}
- virtual void RunTestOnMainThreadLoop() {
+ virtual void RunTestOnMainThreadLoop() OVERRIDE {
launcher_ = ash::Launcher::ForPrimaryDisplay();
controller_ = static_cast<ChromeLauncherController*>(launcher_->delegate());
return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
@@ -95,7 +95,7 @@
command_line->AppendSwitch(ash::switches::kAshEnablePerAppLauncher);
}
- virtual void RunTestOnMainThreadLoop() {
+ virtual void RunTestOnMainThreadLoop() OVERRIDE {
launcher_ = ash::Launcher::ForPrimaryDisplay();
model_ =
ash::test::ShellTestApi(ash::Shell::GetInstance()).launcher_model();
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
index 9648ea3..c30bbb2c 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
@@ -33,7 +33,7 @@
ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
}
- ~FaviconBitmapHandler() {}
+ virtual ~FaviconBitmapHandler() {}
const SkBitmap& bitmap() const { return bitmap_; }
diff --git a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
index 3db397d..648f343 100644
--- a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
+++ b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
@@ -41,27 +41,27 @@
is_muted_ = mute;
}
- bool IsMuteLocked() OVERRIDE {
+ virtual bool IsMuteLocked() OVERRIDE {
return is_mute_locked_;
}
- void SetMuteLocked(bool locked) OVERRIDE {
+ virtual void SetMuteLocked(bool locked) OVERRIDE {
is_mute_locked_ = locked;
}
- bool IsCaptureMuted() OVERRIDE {
+ virtual bool IsCaptureMuted() OVERRIDE {
return is_capture_muted_;
}
- void SetCaptureMuted(bool mute) OVERRIDE {
+ virtual void SetCaptureMuted(bool mute) OVERRIDE {
is_capture_muted_ = mute;
}
- bool IsCaptureMuteLocked() OVERRIDE {
+ virtual bool IsCaptureMuteLocked() OVERRIDE {
return is_capture_mute_locked_;
}
- void SetCaptureMuteLocked(bool locked) OVERRIDE {
+ virtual void SetCaptureMuteLocked(bool locked) OVERRIDE {
is_capture_mute_locked_ = locked;
}
diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc
index 4f5b81e..95f2e8f 100644
--- a/chrome/browser/ui/ash/window_positioner_unittest.cc
+++ b/chrome/browser/ui/ash/window_positioner_unittest.cc
@@ -59,7 +59,7 @@
class WindowPositionerTest : public AshTestBase {
public:
WindowPositionerTest();
- ~WindowPositionerTest();
+ virtual ~WindowPositionerTest();
virtual void SetUp() OVERRIDE;
virtual void TearDown() OVERRIDE;
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 30c4ea7..26275a5 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -141,7 +141,7 @@
virtual void TabClosingAt(TabStripModel* tab_strip_model,
WebContents* contents,
- int index) {
+ int index) OVERRIDE {
++closing_count_;
}
@@ -1587,7 +1587,7 @@
public:
ShowModalDialogTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kDisablePopupBlocking);
}
};
@@ -1623,7 +1623,7 @@
public:
KioskModeTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kKioskMode);
}
};
@@ -1673,7 +1673,7 @@
public:
RunInBackgroundTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kKeepAliveForTest);
}
};
@@ -1703,7 +1703,7 @@
public:
NoStartupWindowTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kNoStartupWindow);
command_line->AppendSwitch(switches::kKeepAliveForTest);
}
@@ -1745,7 +1745,7 @@
public:
AppModeTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
GURL url = ui_test_utils::GetTestUrl(
FilePath(), FilePath().AppendASCII("title1.html"));
command_line->AppendSwitchASCII(switches::kApp, url.spec());
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index 11dc8ef..b4bb164 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -199,7 +199,7 @@
interstitial_page_->Show();
}
- virtual std::string GetHTMLContents() {
+ virtual std::string GetHTMLContents() OVERRIDE {
return html_contents_;
}
diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
index 4c61752d..76ba71c 100644
--- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
@@ -23,7 +23,7 @@
// Subclass that tests navigation while in the Guest session.
class BrowserGuestSessionNavigatorTest: public BrowserNavigatorTest {
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
CommandLine command_line_copy = *command_line;
command_line_copy.AppendSwitchASCII(switches::kLoginProfile, "user");
chromeos::LoginUtils::Get()->GetOffTheRecordCommandLine(GetGoogleURL(),
diff --git a/chrome/browser/ui/certificate_dialogs.cc b/chrome/browser/ui/certificate_dialogs.cc
index daf04c4..4a9b310 100644
--- a/chrome/browser/ui/certificate_dialogs.cc
+++ b/chrome/browser/ui/certificate_dialogs.cc
@@ -65,12 +65,12 @@
public:
Exporter(WebContents* web_contents, gfx::NativeWindow parent,
net::X509Certificate::OSCertHandle cert);
- ~Exporter();
+ virtual ~Exporter();
// SelectFileDialog::Listener implemenation.
virtual void FileSelected(const FilePath& path,
- int index, void* params);
- virtual void FileSelectionCanceled(void* params);
+ int index, void* params) OVERRIDE;
+ virtual void FileSelectionCanceled(void* params) OVERRIDE;
private:
scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
diff --git a/chrome/browser/ui/chrome_select_file_policy_unittest.cc b/chrome/browser/ui/chrome_select_file_policy_unittest.cc
index 25ced3e..e6e54a0d 100644
--- a/chrome/browser/ui/chrome_select_file_policy_unittest.cc
+++ b/chrome/browser/ui/chrome_select_file_policy_unittest.cc
@@ -37,7 +37,7 @@
: file_selection_initialisation_in_progress(false) {
}
- ~FileSelectionUser() {
+ virtual ~FileSelectionUser() {
if (select_file_dialog_.get())
select_file_dialog_->ListenerDestroyed();
}
@@ -64,15 +64,15 @@
// ui::SelectFileDialog::Listener implementation.
virtual void FileSelected(const FilePath& path,
- int index, void* params){
+ int index, void* params) OVERRIDE{
ASSERT_FALSE(file_selection_initialisation_in_progress);
}
virtual void MultiFilesSelected(
const std::vector<FilePath>& files,
- void* params) {
+ void* params) OVERRIDE {
ASSERT_FALSE(file_selection_initialisation_in_progress);
}
- virtual void FileSelectionCanceled(void* params) {
+ virtual void FileSelectionCanceled(void* params) OVERRIDE {
ASSERT_FALSE(file_selection_initialisation_in_progress);
}
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 52f19686..fa67b7c 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -152,7 +152,7 @@
private:
void SetCustomLink();
- virtual void OnCustomLinkClicked() {}
+ virtual void OnCustomLinkClicked() OVERRIDE {}
};
ContentSettingTitleLinkAndCustomModel::ContentSettingTitleLinkAndCustomModel(
@@ -450,7 +450,7 @@
private:
void SetPopups();
- virtual void OnPopupClicked(int index);
+ virtual void OnPopupClicked(int index) OVERRIDE;
};
ContentSettingPopupBubbleModel::ContentSettingPopupBubbleModel(
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
index 288aaaf6..d3bbc67 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -366,7 +366,7 @@
class FakeDelegate : public ProtocolHandlerRegistry::Delegate {
public:
- virtual void RegisterExternalHandler(const std::string& protocol) {
+ virtual void RegisterExternalHandler(const std::string& protocol) OVERRIDE {
// Overrides in order to not register the handler with the
// ChildProcessSecurityPolicy. That has persistent and unalterable
// side effects on other tests.
@@ -374,19 +374,19 @@
virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
ShellIntegration::DefaultWebClientObserver* observer,
- const std::string& protocol) {
+ const std::string& protocol) OVERRIDE {
LOG(INFO) << "CreateShellWorker";
return NULL;
}
virtual ProtocolHandlerRegistry::DefaultClientObserver* CreateShellObserver(
- ProtocolHandlerRegistry* registry) {
+ ProtocolHandlerRegistry* registry) OVERRIDE {
return NULL;
}
virtual void RegisterWithOSAsDefaultClient(
const std::string& protocol,
- ProtocolHandlerRegistry* registry) {
+ ProtocolHandlerRegistry* registry) OVERRIDE {
LOG(INFO) << "Register With OS";
}
};
diff --git a/chrome/browser/ui/global_error/global_error_service_browsertest.cc b/chrome/browser/ui/global_error/global_error_service_browsertest.cc
index 4cfe6f8..739edce 100644
--- a/chrome/browser/ui/global_error/global_error_service_browsertest.cc
+++ b/chrome/browser/ui/global_error/global_error_service_browsertest.cc
@@ -21,7 +21,7 @@
int bubble_view_close_count() { return bubble_view_close_count_; }
- bool HasBadge() OVERRIDE { return false; }
+ virtual bool HasBadge() OVERRIDE { return false; }
virtual int GetBadgeResourceID() OVERRIDE {
ADD_FAILURE();
return 0;
diff --git a/chrome/browser/ui/global_error/global_error_service_unittest.cc b/chrome/browser/ui/global_error/global_error_service_unittest.cc
index 4ca56a74..13652a7 100644
--- a/chrome/browser/ui/global_error/global_error_service_unittest.cc
+++ b/chrome/browser/ui/global_error/global_error_service_unittest.cc
@@ -19,7 +19,7 @@
static int count() { return count_; }
- bool HasBadge() OVERRIDE { return false; }
+ virtual bool HasBadge() OVERRIDE { return false; }
virtual int GetBadgeResourceID() OVERRIDE {
ADD_FAILURE();
return 0;
@@ -84,8 +84,8 @@
class BadgeError : public BaseError {
public:
explicit BadgeError(int resource_id) : resource_id_(resource_id) {}
- bool HasBadge() OVERRIDE { return true; }
- Severity GetSeverity() OVERRIDE {
+ virtual bool HasBadge() OVERRIDE { return true; }
+ virtual Severity GetSeverity() OVERRIDE {
return static_cast<Severity>(resource_id_);
}
virtual int GetBadgeResourceID() OVERRIDE { return resource_id_; }
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
index 096435c..785dc631 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
@@ -22,7 +22,7 @@
// rendering here so all we need is a non-NULL object.
class EmptyTabstripOriginProvider : public TabstripOriginProvider {
public:
- virtual gfx::Point GetTabStripOriginForWidget(GtkWidget* widget) {
+ virtual gfx::Point GetTabStripOriginForWidget(GtkWidget* widget) OVERRIDE {
return gfx::Point(0, 0);
}
};
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
index b4af4660..403b65b5 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
@@ -130,7 +130,7 @@
};
// Overridden from ui::SimpleMenuModel::Delegate:
- virtual bool IsCommandIdEnabled(int command_id) const {
+ virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
if (editor_ == NULL)
return false;
@@ -144,16 +144,17 @@
return false;
}
- virtual bool IsCommandIdChecked(int command_id) const {
+ virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
return false;
}
- virtual bool GetAcceleratorForCommandId(int command_id,
- ui::Accelerator* accelerator) {
+ virtual bool GetAcceleratorForCommandId(
+ int command_id,
+ ui::Accelerator* accelerator) OVERRIDE {
return false;
}
- virtual void ExecuteCommand(int command_id) {
+ virtual void ExecuteCommand(int command_id) OVERRIDE {
if (!editor_)
return;
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index cd1f8d7..cde43f7f 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -158,7 +158,7 @@
toolbar->browser()->profile()->GetOriginalProfile()));
}
- ~BrowserActionButton() {
+ virtual ~BrowserActionButton() {
DisconnectBrowserActionPopupAccelerator();
alignment_.Destroy();
@@ -171,9 +171,9 @@
const Extension* extension() { return extension_; }
// NotificationObserver implementation.
- void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ virtual void Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE {
switch (type) {
case chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED:
UpdateState();
@@ -204,7 +204,7 @@
}
// ExtensionActionIconFactory::Observer implementation.
- void OnIconUpdated() OVERRIDE {
+ virtual void OnIconUpdated() OVERRIDE {
UpdateState();
}
@@ -274,7 +274,7 @@
}
// MenuGtk::Delegate implementation.
- virtual void StoppedShowing() {
+ virtual void StoppedShowing() OVERRIDE {
if (enabled_)
button_->UnsetPaintOverride();
else
@@ -286,7 +286,7 @@
gtk_util::GrabAllInput(toolbar_->overflow_menu_->widget());
}
- virtual void CommandWillBeExecuted() {
+ virtual void CommandWillBeExecuted() OVERRIDE {
// If the context menu was showing for the overflow menu, and a command
// is executed, then stop showing the overflow menu.
if (toolbar_->overflow_menu_.get())
@@ -294,7 +294,7 @@
}
// ExtensionContextMenuModel::PopupDelegate implementation.
- virtual void InspectPopup(ExtensionAction* action) {
+ virtual void InspectPopup(ExtensionAction* action) OVERRIDE {
GURL popup_url = action->GetPopupUrl(toolbar_->GetCurrentTabId());
ExtensionPopupGtk::Show(popup_url, toolbar_->browser(), widget(),
ExtensionPopupGtk::SHOW_AND_INSPECT);
diff --git a/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc b/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
index 4a519d58..caca11b4 100644
--- a/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
@@ -53,12 +53,12 @@
void Close();
// Animation implementation.
- virtual void AnimateToState(double state);
+ virtual void AnimateToState(double state) OVERRIDE;
// NotificationObserver
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details);
+ const content::NotificationDetails& details) OVERRIDE;
// The top level window that floats over the browser and displays the
// image.
diff --git a/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc b/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc
index 17e7e48e..6375c13 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc
+++ b/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc
@@ -26,7 +26,7 @@
gtk_container_set_border_width(GTK_CONTAINER(box_), kBorderWidth);
}
- ~GtkChromeShrinkableHBoxTest() {
+ virtual ~GtkChromeShrinkableHBoxTest() {
gtk_widget_destroy(window_);
}
diff --git a/chrome/browser/ui/gtk/login_prompt_gtk.cc b/chrome/browser/ui/gtk/login_prompt_gtk.cc
index 8992030..72e51bb4 100644
--- a/chrome/browser/ui/gtk/login_prompt_gtk.cc
+++ b/chrome/browser/ui/gtk/login_prompt_gtk.cc
@@ -46,7 +46,7 @@
// LoginModelObserver implementation.
virtual void OnAutofillDataAvailable(const string16& username,
- const string16& password) {
+ const string16& password) OVERRIDE {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// NOTE: Would be nice to use gtk_entry_get_text_length, but it is fairly
@@ -61,8 +61,9 @@
}
// LoginHandler:
- virtual void BuildViewForPasswordManager(PasswordManager* manager,
- const string16& explanation) {
+ virtual void BuildViewForPasswordManager(
+ PasswordManager* manager,
+ const string16& explanation) OVERRIDE {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
root_.Own(gtk_vbox_new(FALSE, ui::kContentAreaBorder));
@@ -117,15 +118,15 @@
}
// Overridden from ConstrainedWindowGtkDelegate:
- virtual GtkWidget* GetWidgetRoot() {
+ virtual GtkWidget* GetWidgetRoot() OVERRIDE {
return root_.get();
}
- virtual GtkWidget* GetFocusWidget() {
+ virtual GtkWidget* GetFocusWidget() OVERRIDE {
return username_entry_;
}
- virtual void DeleteDelegate() {
+ virtual void DeleteDelegate() OVERRIDE {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// The constrained window is going to delete itself; clear our pointer.
diff --git a/chrome/browser/ui/gtk/panels/panel_drag_gtk.cc b/chrome/browser/ui/gtk/panels/panel_drag_gtk.cc
index d63cbf2..82a928f 100644
--- a/chrome/browser/ui/gtk/panels/panel_drag_gtk.cc
+++ b/chrome/browser/ui/gtk/panels/panel_drag_gtk.cc
@@ -65,15 +65,15 @@
public:
explicit MoveDragDelegate(Panel* panel)
: PanelDragDelegate(panel) {}
- ~MoveDragDelegate() {}
+ virtual ~MoveDragDelegate() {}
- void DragStarted(gfx::Point point) OVERRIDE {
+ virtual void DragStarted(gfx::Point point) OVERRIDE {
panel_manager()->StartDragging(panel(), point);
}
- void Dragged(gfx::Point point) OVERRIDE {
+ virtual void Dragged(gfx::Point point) OVERRIDE {
panel_manager()->Drag(point);
}
- void DragEnded(bool canceled) OVERRIDE {
+ virtual void DragEnded(bool canceled) OVERRIDE {
panel_manager()->EndDragging(canceled);
}
@@ -86,15 +86,15 @@
ResizeDragDelegate(Panel* panel, GdkWindowEdge edge)
: PanelDragDelegate(panel),
resizing_side_(GdkWindowEdgeToResizingSide(edge)) {}
- ~ResizeDragDelegate() {}
+ virtual ~ResizeDragDelegate() {}
- void DragStarted(gfx::Point point) OVERRIDE {
+ virtual void DragStarted(gfx::Point point) OVERRIDE {
panel_manager()->StartResizingByMouse(panel(), point, resizing_side_);
}
- void Dragged(gfx::Point point) OVERRIDE {
+ virtual void Dragged(gfx::Point point) OVERRIDE {
panel_manager()->ResizeByMouse(point);
}
- void DragEnded(bool canceled) OVERRIDE {
+ virtual void DragEnded(bool canceled) OVERRIDE {
panel_manager()->EndResizingByMouse(canceled);
}
private:
diff --git a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
index a5acd69..faac3a1 100644
--- a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
@@ -47,7 +47,7 @@
SpeechRecognitionBubbleGtk(WebContents* web_contents,
Delegate* delegate,
const gfx::Rect& element_rect);
- ~SpeechRecognitionBubbleGtk();
+ virtual ~SpeechRecognitionBubbleGtk();
private:
// SpeechRecognitionBubbleBase:
diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
index 51ecba0..3a28326db 100644
--- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
@@ -50,17 +50,17 @@
const net::HttpNetworkSession* network_session,
net::SSLCertRequestInfo* cert_request_info,
const base::Callback<void(net::X509Certificate*)>& callback);
- ~SSLClientCertificateSelector();
+ virtual ~SSLClientCertificateSelector();
void Show();
// SSLClientAuthObserver implementation:
- virtual void OnCertSelectedByNotification();
+ virtual void OnCertSelectedByNotification() OVERRIDE;
// ConstrainedWindowGtkDelegate implementation:
- virtual GtkWidget* GetWidgetRoot() { return root_widget_.get(); }
- virtual GtkWidget* GetFocusWidget();
- virtual void DeleteDelegate();
+ virtual GtkWidget* GetWidgetRoot() OVERRIDE { return root_widget_.get(); }
+ virtual GtkWidget* GetFocusWidget() OVERRIDE;
+ virtual void DeleteDelegate() OVERRIDE;
private:
void PopulateCerts();
diff --git a/chrome/browser/ui/gtk/tabs/dock_info_gtk.cc b/chrome/browser/ui/gtk/tabs/dock_info_gtk.cc
index 34557c1..da569a52 100644
--- a/chrome/browser/ui/gtk/tabs/dock_info_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/dock_info_gtk.cc
@@ -40,7 +40,7 @@
}
// Returns true if iteration should stop, false otherwise.
- virtual bool ShouldStopIterating(XID window) {
+ virtual bool ShouldStopIterating(XID window) OVERRIDE {
return false;
}
@@ -67,7 +67,7 @@
}
protected:
- virtual bool ShouldStopIterating(XID window) {
+ virtual bool ShouldStopIterating(XID window) OVERRIDE {
if (BaseWindowFinder::ShouldIgnoreWindow(window))
return false;
@@ -133,7 +133,7 @@
}
protected:
- virtual bool ShouldStopIterating(XID window) {
+ virtual bool ShouldStopIterating(XID window) OVERRIDE {
if (BaseWindowFinder::ShouldIgnoreWindow(window))
return false;
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index 00e07351..f52a3f4 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -287,7 +287,7 @@
virtual ~FaviconCrashAnimation() {}
// ui::Animation overrides:
- virtual void AnimateToState(double state) {
+ virtual void AnimateToState(double state) OVERRIDE {
const double kHidingOffset = 27;
if (state < .5) {
@@ -302,7 +302,7 @@
}
// ui::AnimationDelegate overrides:
- virtual void AnimationCanceled(const ui::Animation* animation) {
+ virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE {
target_->SetFaviconHidingOffset(0);
}
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index f5ad82e..81d2394a 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -200,16 +200,16 @@
}
// Overridden from ui::AnimationDelegate:
- virtual void AnimationProgressed(const ui::Animation* animation) {
+ virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
tabstrip_->AnimationLayout(end_unselected_width_);
}
- virtual void AnimationEnded(const ui::Animation* animation) {
+ virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE {
tabstrip_->FinishAnimation(this, layout_on_completion_);
// This object is destroyed now, so we can't do anything else after this.
}
- virtual void AnimationCanceled(const ui::Animation* animation) {
+ virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE {
AnimationEnded(animation);
}
@@ -296,7 +296,7 @@
protected:
// Overridden from TabStripGtk::TabAnimation:
- virtual double GetWidthForTab(int index) const {
+ virtual double GetWidthForTab(int index) const OVERRIDE {
if (index == index_) {
bool is_selected = tabstrip_->model()->active_index() == index;
double start_width, target_width;
@@ -371,7 +371,7 @@
protected:
// Overridden from TabStripGtk::TabAnimation:
- virtual double GetWidthForTab(int index) const {
+ virtual double GetWidthForTab(int index) const OVERRIDE {
TabGtk* tab = tabstrip_->GetTabAt(index);
if (index == index_) {
@@ -411,7 +411,7 @@
return start_unselected_width_ + (delta * animation_.GetCurrentValue());
}
- virtual void AnimationEnded(const ui::Animation* animation) {
+ virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE {
tabstrip_->RemoveTabAt(index_);
TabStripGtk::TabAnimation::AnimationEnded(animation);
}
@@ -442,7 +442,7 @@
virtual ~MoveTabAnimation() {}
// Overridden from ui::AnimationDelegate:
- virtual void AnimationProgressed(const ui::Animation* animation) {
+ virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
// Position Tab A
double distance = start_tab_b_bounds_.x() - start_tab_a_bounds_.x();
double delta = distance * animation_.GetCurrentValue();
@@ -462,7 +462,9 @@
protected:
// Overridden from TabStripGtk::TabAnimation:
- virtual int GetDuration() const { return kReorderAnimationDurationMs; }
+ virtual int GetDuration() const OVERRIDE {
+ return kReorderAnimationDurationMs;
+ }
private:
// The two tabs being exchanged.
@@ -493,18 +495,18 @@
virtual ~ResizeLayoutAnimation() {}
// Overridden from ui::AnimationDelegate:
- virtual void AnimationEnded(const ui::Animation* animation) {
+ virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE {
tabstrip_->needs_resize_layout_ = false;
TabStripGtk::TabAnimation::AnimationEnded(animation);
}
protected:
// Overridden from TabStripGtk::TabAnimation:
- virtual int GetDuration() const {
+ virtual int GetDuration() const OVERRIDE {
return kResizeLayoutAnimationDurationMs;
}
- virtual double GetWidthForTab(int index) const {
+ virtual double GetWidthForTab(int index) const OVERRIDE {
TabGtk* tab = tabstrip_->GetTabAt(index);
if (tab->mini())
@@ -561,11 +563,11 @@
protected:
// Overridden from TabStripGtk::TabAnimation:
- virtual int GetDuration() const {
+ virtual int GetDuration() const OVERRIDE {
return kMiniTabAnimationDurationMs;
}
- virtual double GetWidthForTab(int index) const {
+ virtual double GetWidthForTab(int index) const OVERRIDE {
TabGtk* tab = tabstrip_->GetTabAt(index);
if (index == index_) {
@@ -627,7 +629,7 @@
}
// Overridden from ui::AnimationDelegate:
- virtual void AnimationProgressed(const ui::Animation* animation) {
+ virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
// Do the normal layout.
TabAnimation::AnimationProgressed(animation);
@@ -641,12 +643,12 @@
tabstrip_->SetTabBounds(tab_, tab_bounds);
}
- virtual void AnimationEnded(const ui::Animation* animation) {
+ virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE {
tabstrip_->needs_resize_layout_ = false;
TabStripGtk::TabAnimation::AnimationEnded(animation);
}
- virtual double GetGapWidth(int index) {
+ virtual double GetGapWidth(int index) OVERRIDE {
if (to_index_ < from_index_) {
// The tab was made mini.
if (index == to_index_) {
@@ -669,9 +671,11 @@
protected:
// Overridden from TabStripGtk::TabAnimation:
- virtual int GetDuration() const { return kReorderAnimationDurationMs; }
+ virtual int GetDuration() const OVERRIDE {
+ return kReorderAnimationDurationMs;
+ }
- virtual double GetWidthForTab(int index) const {
+ virtual double GetWidthForTab(int index) const OVERRIDE {
TabGtk* tab = tabstrip_->GetTabAt(index);
if (index == to_index_)
@@ -2198,7 +2202,8 @@
Browser* browser = window_->browser();
DCHECK(browser);
- chrome::AddSelectedTabWithURL(browser, url, content::PAGE_TRANSITION_TYPED);
+ chrome::AddSelectedTabWithURL(
+ browser, url, content::PAGE_TRANSITION_TYPED);
break;
}
default:
diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc
index 4b6e408..bd86a8b 100644
--- a/chrome/browser/ui/gtk/task_manager_gtk.cc
+++ b/chrome/browser/ui/gtk/task_manager_gtk.cc
@@ -274,14 +274,14 @@
private:
// ui::SimpleMenuModel::Delegate implementation:
- virtual bool IsCommandIdEnabled(int command_id) const {
+ virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
if (!task_manager_)
return false;
return true;
}
- virtual bool IsCommandIdChecked(int command_id) const {
+ virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
if (!task_manager_)
return false;
@@ -291,11 +291,11 @@
virtual bool GetAcceleratorForCommandId(
int command_id,
- ui::Accelerator* accelerator) {
+ ui::Accelerator* accelerator) OVERRIDE {
return false;
}
- virtual void ExecuteCommand(int command_id) {
+ virtual void ExecuteCommand(int command_id) OVERRIDE {
if (!task_manager_)
return;
diff --git a/chrome/browser/ui/intents/web_intent_icon_loader.cc b/chrome/browser/ui/intents/web_intent_icon_loader.cc
index d6db406..6792a14 100644
--- a/chrome/browser/ui/intents/web_intent_icon_loader.cc
+++ b/chrome/browser/ui/intents/web_intent_icon_loader.cc
@@ -52,7 +52,7 @@
explicit URLFetcherTrampoline(const ForwardingCallback& callback)
: callback_(callback) {}
- ~URLFetcherTrampoline() {}
+ virtual ~URLFetcherTrampoline() {}
// net::URLFetcherDelegate implementation.
virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index 55a3aaf..185b3ef 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -77,7 +77,8 @@
virtual ~SourceWindowObserver() {}
// Implement WebContentsObserver
- virtual void WebContentsDestroyed(content::WebContents* web_contents) {
+ virtual void WebContentsDestroyed(
+ content::WebContents* web_contents) OVERRIDE {
if (controller_)
controller_->SourceWebContentsDestroyed(web_contents);
delete this;
diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc
index 9e5d455d..41550fd 100644
--- a/chrome/browser/ui/login/login_prompt_browsertest.cc
+++ b/chrome/browser/ui/login/login_prompt_browsertest.cc
@@ -89,7 +89,7 @@
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details);
+ const content::NotificationDetails& details) OVERRIDE;
void AddHandler(LoginHandler* handler);
diff --git a/chrome/browser/ui/omnibox/action_box_browsertest.cc b/chrome/browser/ui/omnibox/action_box_browsertest.cc
index 236f1f1..3d24250 100644
--- a/chrome/browser/ui/omnibox/action_box_browsertest.cc
+++ b/chrome/browser/ui/omnibox/action_box_browsertest.cc
@@ -32,7 +32,7 @@
protected:
ActionBoxTest() {}
- virtual void SetUpOnMainThread() {
+ virtual void SetUpOnMainThread() OVERRIDE {
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
ASSERT_NO_FATAL_FAILURE(SetupComponents());
chrome::FocusLocationBar(browser());
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
index 6e801b2..c151f18 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
@@ -74,8 +74,8 @@
virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE {
return 0;
}
- virtual gfx::Font GetFont() { return gfx::Font(); }
- virtual int WidthOfTextAfterCursor() { return 0; }
+ virtual gfx::Font GetFont() OVERRIDE { return gfx::Font(); }
+ virtual int WidthOfTextAfterCursor() OVERRIDE { return 0; }
#endif
virtual int GetOmniboxTextLength() const OVERRIDE { return 0; }
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 94b762d..1cb71e0 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -164,7 +164,7 @@
: location_bar_focus_view_id_(VIEW_ID_LOCATION_BAR) {
}
- virtual void SetUpOnMainThread() {
+ virtual void SetUpOnMainThread() OVERRIDE {
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
ASSERT_NO_FATAL_FAILURE(SetupComponents());
chrome::FocusLocationBar(browser());
@@ -375,7 +375,7 @@
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
switch (type) {
case content::NOTIFICATION_WEB_CONTENTS_DESTROYED:
case chrome::NOTIFICATION_TAB_PARENTED:
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
index 4c3c9d8..ba46f82 100644
--- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
@@ -36,19 +36,19 @@
Init(false);
}
- virtual void OnModelChanged() {
+ virtual void OnModelChanged() OVERRIDE {
model_changed_count_++;
}
- virtual void OnItemsChanged(int start, int length) {
+ virtual void OnItemsChanged(int start, int length) OVERRIDE {
items_changed_count_++;
}
- virtual void OnItemsAdded(int start, int length) {
+ virtual void OnItemsAdded(int start, int length) OVERRIDE {
added_count_++;
}
- virtual void OnItemsRemoved(int start, int length) {
+ virtual void OnItemsRemoved(int start, int length) OVERRIDE {
removed_count_++;
}
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index f1b0fad..aef9ade 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -115,11 +115,11 @@
public:
OpenURLsPopupObserver() : added_browser_(NULL) { }
- virtual void OnBrowserAdded(Browser* browser) {
+ virtual void OnBrowserAdded(Browser* browser) OVERRIDE {
added_browser_ = browser;
}
- virtual void OnBrowserRemoved(Browser* browser) { }
+ virtual void OnBrowserRemoved(Browser* browser) OVERRIDE { }
Browser* added_browser_;
};
diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
index 2ffc9fa..23a1390 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -164,7 +164,7 @@
// Override ProfileSyncService::Shutdown() to avoid CHECK on
// |invalidator_registrar_|.
- void Shutdown() OVERRIDE {};
+ virtual void Shutdown() OVERRIDE {};
private:
explicit OneClickTestProfileSyncService(Profile* profile)
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
index ea200c7..4da92582 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -61,7 +61,7 @@
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
WebContents* tab_to_delete = tab_to_delete_;
tab_to_delete_ = NULL;
delete tab_to_delete;
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
index 06c418f..246ff88 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
@@ -47,7 +47,7 @@
public:
FaviconDelegate() : was_called_(false) {}
- void OnIconChanged(int model_index) {
+ virtual void OnIconChanged(int model_index) OVERRIDE {
was_called_ = true;
MessageLoop::current()->Quit();
}
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
index 52f2fb6..a9e23cb 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
@@ -28,7 +28,7 @@
int execute_count() { return execute_count_; }
- bool HasBadge() OVERRIDE { return false; }
+ virtual bool HasBadge() OVERRIDE { return false; }
virtual int GetBadgeResourceID() OVERRIDE {
ADD_FAILURE();
return 0;
@@ -85,7 +85,7 @@
// Don't handle accelerators.
virtual bool GetAcceleratorForCommandId(
int command_id,
- ui::Accelerator* accelerator) { return false; }
+ ui::Accelerator* accelerator) OVERRIDE { return false; }
};
// Copies parts of MenuModelTest::Delegate and combines them with the
@@ -102,19 +102,19 @@
}
// Testing overrides to ui::SimpleMenuModel::Delegate:
- virtual bool IsCommandIdChecked(int command_id) const {
+ virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
bool val = WrenchMenuModel::IsCommandIdChecked(command_id);
if (val)
checked_count_++;
return val;
}
- virtual bool IsCommandIdEnabled(int command_id) const {
+ virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
++enable_count_;
return true;
}
- virtual void ExecuteCommand(int command_id) { ++execute_count_; }
+ virtual void ExecuteCommand(int command_id) OVERRIDE { ++execute_count_; }
int execute_count_;
mutable int checked_count_;
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
index e991a22f..051bfa7 100644
--- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
@@ -75,7 +75,7 @@
role_(role) {
}
- void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
+ virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
views::View::GetAccessibleState(state);
state->name = name_;
state->role = role_;
@@ -138,7 +138,7 @@
// ACCESSIBILITY_CONTROL_FOCUSED event.
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
ASSERT_EQ(type, chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED);
const AccessibilityControlInfo* info =
content::Details<const AccessibilityControlInfo>(details).ptr();
diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc
index 6b8cad8..758c6cb 100644
--- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc
+++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc
@@ -71,10 +71,10 @@
const gfx::Size& icon_size,
const gfx::ImageSkia& badge);
- ~BadgeImageSource();
+ virtual ~BadgeImageSource();
// Overridden from CanvasImageSource:
- void Draw(gfx::Canvas* canvas) OVERRIDE;
+ virtual void Draw(gfx::Canvas* canvas) OVERRIDE;
private:
gfx::Size ComputeSize(const gfx::ImageSkia& icon,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index b7ffe23..114a07e 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -233,7 +233,7 @@
return false;
}
- virtual void OnPaint(gfx::Canvas* canvas) {
+ virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
views::MenuButton::PaintButton(canvas, views::MenuButton::PB_NORMAL);
}
@@ -251,7 +251,7 @@
: MenuButton(NULL, string16(), owner, false),
owner_(owner) {}
- virtual bool OnMousePressed(const ui::MouseEvent& e) {
+ virtual bool OnMousePressed(const ui::MouseEvent& e) OVERRIDE {
owner_->StopThrobbing(true);
return views::MenuButton::OnMousePressed(e);
}
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 5f3281cb..4c938b3 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -176,11 +176,11 @@
}
protected:
- virtual views::View* CreateContentsView() {
+ virtual views::View* CreateContentsView() OVERRIDE {
return bb_view_.get();
}
- virtual gfx::Size GetPreferredSize() { return bb_view_pref_; }
+ virtual gfx::Size GetPreferredSize() OVERRIDE { return bb_view_pref_; }
views::TextButton* GetBookmarkButton(int view_index) {
return bb_view_->GetBookmarkButton(view_index);
@@ -234,7 +234,7 @@
// child, clicks it and makes sure a navigation occurs.
class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// mouse.
views::TextButton* button = GetBookmarkButton(0);
@@ -285,7 +285,7 @@
// Brings up menu, clicks on empty space and make sure menu hides.
class BookmarkBarViewTest2 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// mouse.
views::TextButton* button = GetBookmarkButton(0);
@@ -336,7 +336,7 @@
// another child and make sure next menu appears.
class BookmarkBarViewTest3 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// mouse.
views::MenuButton* button = bb_view_->other_bookmarked_button();
@@ -418,7 +418,7 @@
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
MessageLoop::current()->PostTask(FROM_HERE, task_);
}
@@ -443,7 +443,7 @@
}
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// mouse.
views::TextButton* button = bb_view_->other_bookmarked_button();
@@ -496,7 +496,7 @@
// Tests drag and drop within the same menu.
class BookmarkBarViewTest5 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
url_dragging_ =
model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url();
@@ -567,7 +567,7 @@
// then selecting an item.
class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Press the mouse button on the overflow button. Don't release it though.
views::TextButton* button = bb_view_->overflow_button();
ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
@@ -604,7 +604,7 @@
// Tests drag and drop to different menu.
class BookmarkBarViewTest7 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
url_dragging_ =
model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url();
@@ -700,7 +700,7 @@
// original menu.
class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
url_dragging_ =
model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url();
@@ -808,9 +808,9 @@
// Moves the mouse over the scroll button and makes sure we get scrolling.
class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase {
protected:
- virtual bool CreateBigMenu() { return true; }
+ virtual bool CreateBigMenu() OVERRIDE { return true; }
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// mouse.
views::TextButton* button = GetBookmarkButton(0);
@@ -879,7 +879,7 @@
// Tests up/down/left/enter key messages.
class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// mouse.
views::TextButton* button = GetBookmarkButton(0);
@@ -994,7 +994,7 @@
}
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// mouse.
views::TextButton* button = bb_view_->other_bookmarked_button();
@@ -1062,7 +1062,7 @@
// Tests showing a modal dialog from a context menu.
class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Open up the other folder.
views::TextButton* button = bb_view_->other_bookmarked_button();
ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
@@ -1071,7 +1071,7 @@
chrome::num_bookmark_urls_before_prompting = 1;
}
- ~BookmarkBarViewTest12() {
+ virtual ~BookmarkBarViewTest12() {
chrome::num_bookmark_urls_before_prompting = 15;
}
@@ -1152,7 +1152,7 @@
}
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// mouse.
views::TextButton* button = bb_view_->other_bookmarked_button();
@@ -1237,7 +1237,7 @@
}
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// right mouse button.
views::TextButton* button = GetBookmarkButton(0);
@@ -1278,7 +1278,7 @@
}
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Show the other bookmarks.
views::TextButton* button = bb_view_->other_bookmarked_button();
ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
@@ -1349,7 +1349,7 @@
// Tests that we don't crash or get stuck if the parent of a menu is closed.
class BookmarkBarViewTest16 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the first folder on the bookmark bar and press the
// mouse.
views::TextButton* button = GetBookmarkButton(0);
@@ -1390,7 +1390,7 @@
}
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the other folder on the bookmark bar and press the
// left mouse button.
views::TextButton* button = bb_view_->other_bookmarked_button();
@@ -1467,7 +1467,7 @@
// menu appears.
class BookmarkBarViewTest18 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the other folder on the bookmark bar and press the
// left mouse button.
views::TextButton* button = bb_view_->other_bookmarked_button();
@@ -1515,7 +1515,7 @@
// the menu.
class BookmarkBarViewTest19 : public BookmarkBarViewEventTestBase {
protected:
- virtual void DoTestOnMessageLoop() {
+ virtual void DoTestOnMessageLoop() OVERRIDE {
// Move the mouse to the other folder on the bookmark bar and press the
// left mouse button.
views::TextButton* button = bb_view_->other_bookmarked_button();
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index 666cbf0..1db6e16 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -140,7 +140,7 @@
}
// views::View overrides.
- virtual gfx::Size GetPreferredSize() {
+ virtual gfx::Size GetPreferredSize() OVERRIDE {
if (!visible())
return gfx::Size();
@@ -150,7 +150,7 @@
return size;
}
- virtual void Layout() {
+ virtual void Layout() OVERRIDE {
content_->SetBounds(
0, views::kRelatedControlVerticalSpacing,
width(), height() - views::kRelatedControlVerticalSpacing);
@@ -158,7 +158,7 @@
virtual void ViewHierarchyChanged(bool is_add,
views::View* parent,
- views::View* child) {
+ views::View* child) OVERRIDE {
if (is_add && child == this)
Init();
}
diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc
index 94fb8540..4ee0fd7 100644
--- a/chrome/browser/ui/views/constrained_window_views.cc
+++ b/chrome/browser/ui/views/constrained_window_views.cc
@@ -110,7 +110,8 @@
}
virtual ~XPWindowResources() {}
- virtual gfx::ImageSkia* GetPartImage(views::FramePartImage part_id) const {
+ virtual gfx::ImageSkia* GetPartImage(
+ views::FramePartImage part_id) const OVERRIDE {
return images_[part_id];
}
@@ -140,7 +141,8 @@
}
virtual ~VistaWindowResources() {}
- virtual gfx::ImageSkia* GetPartImage(views::FramePartImage part_id) const {
+ virtual gfx::ImageSkia* GetPartImage(
+ views::FramePartImage part_id) const OVERRIDE {
return images_[part_id];
}
@@ -173,7 +175,7 @@
bool browser_is_off_the_record);
virtual ~ConstrainedWindowFrameView();
- void UpdateWindowTitle();
+ virtual void UpdateWindowTitle() OVERRIDE;
// Overridden from views::NonClientFrameView:
virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
index 9defbae..809aec6 100644
--- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc
+++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
@@ -58,7 +58,7 @@
done_(false) {
}
- ~TestConstrainedDialog() {}
+ virtual ~TestConstrainedDialog() {}
virtual views::View* GetInitiallyFocusedView() OVERRIDE {
return contents_ ? contents_->GetInitiallyFocusedView() : NULL;
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index ca87daa..ad8d8ce2 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -68,7 +68,7 @@
void UpdateIcon(const gfx::Image& image);
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas);
+ virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
private:
// Initializes the controls
diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc
index 0e6ee624..f875c76 100644
--- a/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc
+++ b/chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc
@@ -17,7 +17,7 @@
class CryptoModulePasswordDialogViewTest : public testing::Test {
public:
CryptoModulePasswordDialogViewTest() {}
- ~CryptoModulePasswordDialogViewTest() {}
+ virtual ~CryptoModulePasswordDialogViewTest() {}
void Capture(const char* text) {
text_ = text;
diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc
index 4b42527a..8280ba2 100644
--- a/chrome/browser/ui/views/download/download_started_animation_views.cc
+++ b/chrome/browser/ui/views/download/download_started_animation_views.cc
@@ -51,12 +51,12 @@
void Close();
// Animation
- virtual void AnimateToState(double state);
+ virtual void AnimateToState(double state) OVERRIDE;
// content::NotificationObserver
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details);
+ const content::NotificationDetails& details) OVERRIDE;
// We use a HWND for the popup so that it may float above any HWNDs in our UI.
views::Widget* popup_;
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
index 4ad0ac8..e9d2262 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
@@ -240,7 +240,8 @@
AddChildView(close_button_);
}
- virtual void ButtonPressed(views::Button* sender, const ui::Event& event) {
+ virtual void ButtonPressed(views::Button* sender,
+ const ui::Event& event) OVERRIDE {
if (sender == close_button_)
bubble_->StartFade(false);
else
@@ -381,7 +382,7 @@
return height;
}
- virtual gfx::Size GetPreferredSize() {
+ virtual gfx::Size GetPreferredSize() OVERRIDE {
int width = kHorizOuterMargin;
width += kIconSize;
width += views::kPanelHorizMargin;
@@ -416,7 +417,7 @@
return gfx::Size(width, std::max(height, kIconSize + 2 * kVertOuterMargin));
}
- virtual void Layout() {
+ virtual void Layout() OVERRIDE {
int x = kHorizOuterMargin;
int y = kVertOuterMargin;
@@ -473,7 +474,7 @@
close_button_->SetBounds(x - 1, y - 1, sz.width(), sz.height());
}
- virtual void OnPaint(gfx::Canvas* canvas) {
+ virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
for (ScopedVector<gfx::RenderText>::const_iterator it =
sign_in_promo_lines_.begin();
it != sign_in_promo_lines_.end(); ++it)
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
index 9ab2b2a..4f1cc90 100644
--- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
@@ -67,7 +67,7 @@
ExtensionUninstallDialogDelegateView* view() { return view_; }
private:
- void Show() OVERRIDE;
+ virtual void Show() OVERRIDE;
ExtensionUninstallDialogDelegateView* view_;
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index f2f69d3..8445fc30 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -206,7 +206,7 @@
Browser* browser);
// View methods 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_;
@@ -286,7 +286,7 @@
EnableCanvasFlippingForRTLUI(true);
}
- virtual void OnPaint(gfx::Canvas* canvas) {
+ virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
views::Widget* widget = GetWidget();
if (!widget || (widget->IsMaximized() || widget->IsFullscreen()))
return;
@@ -305,13 +305,13 @@
return gfx::Size();
}
- virtual gfx::Size GetPreferredSize() {
+ virtual gfx::Size GetPreferredSize() OVERRIDE {
views::Widget* widget = GetWidget();
return (!widget || widget->IsMaximized() || widget->IsFullscreen()) ?
gfx::Size() : GetSize();
}
- virtual void Layout() {
+ virtual void Layout() OVERRIDE {
if (parent()) {
gfx::Size ps = GetPreferredSize();
// No need to handle Right to left text direction here,
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index 36dd69eb..42908bb 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -48,7 +48,7 @@
}
// Overridden from gfx::CanvasImageSource
- void Draw(gfx::Canvas* canvas) OVERRIDE {
+ virtual void Draw(gfx::Canvas* canvas) OVERRIDE {
int image_size = extension_misc::EXTENSION_ICON_BITTY;
canvas->DrawImageInt(icon_, 0, 0, icon_.width(), icon_.height(), 0, 0,
image_size, image_size, false);
diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc
index b8e68dfb..af7844da 100644
--- a/chrome/browser/ui/views/keyboard_access_browsertest.cc
+++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc
@@ -60,11 +60,11 @@
private:
// Inherited from FocusChangeListener
virtual void OnWillChangeFocus(views::View* focused_before,
- views::View* focused_now) {
+ views::View* focused_now) OVERRIDE {
}
virtual void OnDidChangeFocus(views::View* focused_before,
- views::View* focused_now) {
+ views::View* focused_now) OVERRIDE {
if (focused_now && focused_now->id() != previous_view_id_) {
MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
}
diff --git a/chrome/browser/ui/views/login_prompt_views.cc b/chrome/browser/ui/views/login_prompt_views.cc
index b1c32b7..aa026ee 100644
--- a/chrome/browser/ui/views/login_prompt_views.cc
+++ b/chrome/browser/ui/views/login_prompt_views.cc
@@ -143,7 +143,7 @@
friend class base::RefCountedThreadSafe<LoginHandlerViews>;
friend class LoginPrompt;
- ~LoginHandlerViews() {}
+ virtual ~LoginHandlerViews() {}
// The LoginView that contains the user's login information
LoginView* login_view_;
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc
index 82663e18..3bb832d3 100644
--- a/chrome/browser/ui/views/menu_model_adapter_test.cc
+++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -107,7 +107,7 @@
: showing_(false) {
}
- ~SubMenuModel() {
+ virtual ~SubMenuModel() {
}
bool showing() const {
@@ -132,12 +132,12 @@
return ASCIIToUTF16("Item");
}
- virtual void MenuWillShow() {
+ virtual void MenuWillShow() OVERRIDE {
showing_ = true;
}
// Called when the menu has been closed.
- virtual void MenuClosed() {
+ virtual void MenuClosed() OVERRIDE {
showing_ = false;
}
@@ -151,7 +151,7 @@
TopMenuModel() {
}
- ~TopMenuModel() {
+ virtual ~TopMenuModel() {
}
bool IsSubmenuShowing() {
diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.cc b/chrome/browser/ui/views/notifications/balloon_view_host.cc
index 3c0920d..6d302ae5 100644
--- a/chrome/browser/ui/views/notifications/balloon_view_host.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view_host.cc
@@ -20,7 +20,7 @@
virtual void ViewHierarchyChanged(bool is_add,
views::View* parent,
- views::View* child) {
+ views::View* child) OVERRIDE {
NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
if (is_add && GetWidget() && !initialized_) {
initialized_ = true;
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
index 0b91bd5..5c82d8d 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
@@ -62,7 +62,7 @@
}
virtual void MultiFilesSelected(
const std::vector<FilePath>& files, void* params) OVERRIDE {}
- virtual void FileSelectionCanceled(void* params) {
+ virtual void FileSelectionCanceled(void* params) OVERRIDE {
canceled_ = true;
params_ = params;
}
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index 44d7087..e57f686 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -155,10 +155,10 @@
// Animation functions.
double GetCurrentOpacity();
void SetOpacity(double opacity);
- void AnimateToState(double state);
- void AnimationEnded(const Animation* animation);
+ virtual void AnimateToState(double state) OVERRIDE;
+ virtual void AnimationEnded(const Animation* animation) OVERRIDE;
- virtual void OnPaint(gfx::Canvas* canvas);
+ virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
BubbleStage stage_;
BubbleStyle style_;
@@ -487,8 +487,8 @@
// Animation functions.
int GetCurrentBubbleWidth();
void SetBubbleWidth(int width);
- void AnimateToState(double state);
- void AnimationEnded(const ui::Animation* animation);
+ virtual void AnimateToState(double state) OVERRIDE;
+ virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
// Manager that owns us.
StatusBubbleViews* status_bubble_;
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 0389cc1..0bd633a 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -288,7 +288,7 @@
virtual ~FaviconCrashAnimation() {}
// ui::Animation overrides:
- virtual void AnimateToState(double state) {
+ virtual void AnimateToState(double state) OVERRIDE {
const double kHidingOffset = 27;
if (state < .5) {
@@ -303,7 +303,7 @@
}
// ui::AnimationDelegate overrides:
- virtual void AnimationCanceled(const ui::Animation* animation) {
+ virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE {
target_->SetFaviconHidingOffset(0);
}
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 71adc037..e52cd8d 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -92,11 +92,11 @@
public:
explicit DockView(DockInfo::Type type) : type_(type) {}
- virtual gfx::Size GetPreferredSize() {
+ virtual gfx::Size GetPreferredSize() OVERRIDE {
return gfx::Size(DockInfo::popup_width(), DockInfo::popup_height());
}
- virtual void OnPaintBackground(gfx::Canvas* canvas) {
+ virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE {
// Fill the background rect.
SkPaint paint;
paint.setColor(SkColorSetRGB(108, 108, 108));
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index da314d7..1a54dc0 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -244,11 +244,11 @@
explicit ResetDraggingStateDelegate(Tab* tab) : tab_(tab) {
}
- virtual void AnimationEnded(const ui::Animation* animation) {
+ virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE {
tab_->set_dragging(false);
}
- virtual void AnimationCanceled(const ui::Animation* animation) {
+ virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE {
tab_->set_dragging(false);
}
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 8704336..d9d7f8c 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -128,11 +128,11 @@
badge_(badge) {
}
- ~BadgeImageSource() {
+ virtual ~BadgeImageSource() {
}
// Overridden from gfx::CanvasImageSource:
- void Draw(gfx::Canvas* canvas) OVERRIDE {
+ virtual void Draw(gfx::Canvas* canvas) OVERRIDE {
canvas->DrawImageInt(icon_, 0, 0);
canvas->DrawImageInt(badge_, icon_.width() - badge_.width(),
kBadgeTopMargin);
diff --git a/chrome/browser/ui/views/web_intent_picker_views.cc b/chrome/browser/ui/views/web_intent_picker_views.cc
index a23f0c8..a1e555e 100644
--- a/chrome/browser/ui/views/web_intent_picker_views.cc
+++ b/chrome/browser/ui/views/web_intent_picker_views.cc
@@ -564,7 +564,7 @@
const ui::Event& event) OVERRIDE;
// LinkListener implementation.
- void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
+ virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
// Start an animating throbber for this row, and hide the star rating and the
// install button.
diff --git a/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc b/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
index 736ddfe..f9ea5fa 100644
--- a/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
+++ b/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
@@ -33,16 +33,16 @@
: web_contents_(web_contents) {
}
- virtual void ShowWebContentsModalDialog() {}
- virtual void CloseWebContentsModalDialog() {
+ virtual void ShowWebContentsModalDialog() OVERRIDE {}
+ virtual void CloseWebContentsModalDialog() OVERRIDE {
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(web_contents_);
web_contents_modal_dialog_manager->WillClose(this);
close_count++;
}
- virtual void FocusWebContentsModalDialog() {}
- virtual void PulseWebContentsModalDialog() {}
- virtual gfx::NativeWindow GetNativeWindow() {
+ virtual void FocusWebContentsModalDialog() OVERRIDE {}
+ virtual void PulseWebContentsModalDialog() OVERRIDE {}
+ virtual gfx::NativeWindow GetNativeWindow() OVERRIDE {
NOTREACHED();
return NULL;
}
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 2bb654e..d87b5ad 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -125,7 +125,7 @@
virtual void OnDetailsAvailable() OVERRIDE;
private:
- ~AboutMemoryHandler() {}
+ virtual ~AboutMemoryHandler() {}
void BindProcessMetrics(DictionaryValue* data,
ProcessMemoryInformation* info);
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index 8a46929..9d850f8 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -66,8 +66,8 @@
virtual void StartDataRequest(
const std::string& path,
bool is_incognito,
- const content::URLDataSource::GotDataCallback& callback);
- virtual std::string GetMimeType(const std::string&) const {
+ const content::URLDataSource::GotDataCallback& callback) OVERRIDE;
+ virtual std::string GetMimeType(const std::string&) const OVERRIDE {
return "text/html";
}
virtual bool ShouldAddContentSecurityPolicy() const OVERRIDE {
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index 477342a..7311456 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -81,7 +81,7 @@
}
// IPC::Listener implementation.
- virtual bool OnMessageReceived(const IPC::Message& message) {
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(PortalFrameLoadObserver, message)
IPC_MESSAGE_HANDLER(ChromeViewHostMsg_FrameLoadingError, OnFrameLoadError)
@@ -151,9 +151,10 @@
private:
// Changes internal state.
- void OnActivationStateChanged(CellularNetwork* network,
- MobileActivator::PlanActivationState new_state,
- const std::string& error_description);
+ virtual void OnActivationStateChanged(
+ CellularNetwork* network,
+ MobileActivator::PlanActivationState new_state,
+ const std::string& error_description) OVERRIDE;
// Handlers for JS WebUI messages.
void HandleSetTransactionStatus(const ListValue* args);
diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
index bc2b6dd3..7f17ff9d4 100644
--- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
@@ -104,8 +104,8 @@
virtual void StartDataRequest(
const std::string& path,
bool is_incognito,
- const content::URLDataSource::GotDataCallback& callback);
- virtual std::string GetMimeType(const std::string&) const {
+ const content::URLDataSource::GotDataCallback& callback) OVERRIDE;
+ virtual std::string GetMimeType(const std::string&) const OVERRIDE {
return "text/html";
}
virtual bool ShouldAddContentSecurityPolicy() const OVERRIDE {
@@ -113,7 +113,7 @@
}
private:
- ~RegisterPageUIHTMLSource() {}
+ virtual ~RegisterPageUIHTMLSource() {}
DISALLOW_COPY_AND_ASSIGN(RegisterPageUIHTMLSource);
};
diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc
index 04502c9..c6f7c8a 100644
--- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc
@@ -61,7 +61,7 @@
}
private:
- ~SystemInfoUIHTMLSource() {}
+ virtual ~SystemInfoUIHTMLSource() {}
void SysInfoComplete(scoped_ptr<SystemLogsResponse> response);
void RequestComplete();
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index f2bba66..bce9c48 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -45,7 +45,7 @@
virtual bool ShouldAddContentSecurityPolicy() const OVERRIDE;
private:
- ~DevToolsDataSource() {}
+ virtual ~DevToolsDataSource() {}
DISALLOW_COPY_AND_ASSIGN(DevToolsDataSource);
};
diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc
index 15707f8..b0edd52 100644
--- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc
+++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc
@@ -77,11 +77,11 @@
void reset_download_updated() { download_updated_.reset(); }
protected:
- virtual content::WebContents* GetWebUIWebContents() {
+ virtual content::WebContents* GetWebUIWebContents() OVERRIDE {
return NULL;
}
- virtual void CallDownloadsList(const base::ListValue& downloads) {
+ virtual void CallDownloadsList(const base::ListValue& downloads) OVERRIDE {
downloads_list_.reset(downloads.DeepCopy());
if (waiting_list_) {
content::BrowserThread::PostTask(
@@ -89,7 +89,7 @@
}
}
- virtual void CallDownloadUpdated(const base::ListValue& download) {
+ virtual void CallDownloadUpdated(const base::ListValue& download) OVERRIDE {
download_updated_.reset(download.DeepCopy());
if (waiting_updated_) {
content::BrowserThread::PostTask(
diff --git a/chrome/browser/ui/webui/feedback_ui_unittest.cc b/chrome/browser/ui/webui/feedback_ui_unittest.cc
index bf848e6..ee185a8 100644
--- a/chrome/browser/ui/webui/feedback_ui_unittest.cc
+++ b/chrome/browser/ui/webui/feedback_ui_unittest.cc
@@ -34,7 +34,7 @@
class FeedbackUITest : public testing::Test {
public:
FeedbackUITest() {}
- ~FeedbackUITest() {}
+ virtual ~FeedbackUITest() {}
virtual void SetUp() OVERRIDE {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 43ba219b..af415eb 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -580,7 +580,7 @@
typedef std::list<scoped_refptr<net::URLRequestContextGetter> >
ContextGetterList;
- ~IOThreadImpl();
+ virtual ~IOThreadImpl();
// Adds |entry| to the queue of pending log entries to be sent to the page via
// Javascript. Must be called on the IO Thread. Also creates a delayed task
diff --git a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc
index 7aef993..846d82c2a 100644
--- a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc
+++ b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc
@@ -12,12 +12,12 @@
public:
virtual ~MostVisitedWebUITest() {}
- virtual void SetUpInProcessBrowserTestFixture() {
+ virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
WebUIBrowserTest::SetUpInProcessBrowserTestFixture();
AddLibrary(FilePath(FILE_PATH_LITERAL("most_visited_page_test.js")));
}
- virtual void SetUpOnMainThread() {
+ virtual void SetUpOnMainThread() OVERRIDE {
WebUIBrowserTest::SetUpOnMainThread();
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
}
diff --git a/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc b/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc
index fd9b1807f..3165ad3 100644
--- a/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc
+++ b/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc
@@ -187,7 +187,7 @@
items_.push_back(item);
}
- void SetCombiner(SuggestionsCombiner* combiner) OVERRIDE {
+ virtual void SetCombiner(SuggestionsCombiner* combiner) OVERRIDE {
DCHECK(!combiner_);
combiner_ = combiner;
}
diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
index 76542fb..5ad9690 100644
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
@@ -327,7 +327,7 @@
profile_(profile) {
set_web_ui(web_ui);
}
- ~TestingSyncSetupHandler() {
+ virtual ~TestingSyncSetupHandler() {
set_web_ui(NULL);
}
@@ -340,7 +340,7 @@
using SyncSetupHandler::have_signin_tracker;
private:
- void DisplayGaiaLoginInNewTabOrWindow() OVERRIDE {}
+ virtual void DisplayGaiaLoginInNewTabOrWindow() OVERRIDE {}
// Weak pointer to parent profile.
Profile* profile_;
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
index 851b6f8..22319cd 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -53,9 +53,10 @@
}
// Overridden from WindowSizer::StateProvider:
- virtual bool GetPersistentState(gfx::Rect* bounds,
- gfx::Rect* work_area,
- ui::WindowShowState* show_state) const {
+ virtual bool GetPersistentState(
+ gfx::Rect* bounds,
+ gfx::Rect* work_area,
+ ui::WindowShowState* show_state) const OVERRIDE {
DCHECK(bounds);
DCHECK(show_state);
@@ -97,7 +98,7 @@
virtual bool GetLastActiveWindowState(
gfx::Rect* bounds,
- ui::WindowShowState* show_state) const {
+ ui::WindowShowState* show_state) const OVERRIDE {
DCHECK(show_state);
// Applications are always restored with the same position.
if (!app_name_.empty())
