Linux/ChromeOS Chromium style checker cleanup, ash/ 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/12218027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181180 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 61 insertions, 54 deletions

diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 3ffb240..5de157c 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -235,8 +235,8 @@ class DummyImeControlDelegate : public ImeControlDelegate {
   const ui::Accelerator& last_accelerator() const {
     return last_accelerator_;
   }
-  ui::Accelerator RemapAccelerator(
-      const ui::Accelerator& accelerator) {
+  virtual ui::Accelerator RemapAccelerator(
+      const ui::Accelerator& accelerator) OVERRIDE {
     return ui::Accelerator(accelerator);
   }
 
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 27a8954..43e2593 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -81,7 +81,7 @@ class DisplayManagerTest : public test::AshTestBase,
   }
 
   // aura::WindowObserver overrides:
-  virtual void OnWindowDestroying(aura::Window* window) {
+  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
     ASSERT_EQ(Shell::GetPrimaryRootWindow(), window);
     root_window_destroyed_ = true;
   }
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
index 3e31abf..8599535 100644
--- a/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -68,7 +68,7 @@ class DragTestView : public views::View {
 
  private:
   // View overrides:
-  int GetDragOperations(const gfx::Point& press_pt) OVERRIDE {
+  virtual int GetDragOperations(const gfx::Point& press_pt) OVERRIDE {
     return ui::DragDropTypes::DRAG_COPY;
   }
 
@@ -94,7 +94,7 @@ class DragTestView : public views::View {
 
   virtual bool GetDropFormats(
       int* formats,
-      std::set<OSExchangeData::CustomFormat>* custom_formats) {
+      std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE {
     *formats = ui::OSExchangeData::STRING;
     return true;
   }
@@ -159,42 +159,44 @@ class TestDragDropController : public internal::DragDropController {
     drag_string_.clear();
   }
 
-  int StartDragAndDrop(const ui::OSExchangeData& data,
-                       aura::RootWindow* root_window,
-                       aura::Window* source_window,
-                       const gfx::Point& location,
-                       int operation,
-                       ui::DragDropTypes::DragEventSource source) OVERRIDE {
+  virtual int StartDragAndDrop(
+      const ui::OSExchangeData& data,
+      aura::RootWindow* root_window,
+      aura::Window* source_window,
+      const gfx::Point& location,
+      int operation,
+      ui::DragDropTypes::DragEventSource source) OVERRIDE {
     drag_start_received_ = true;
     data.GetString(&drag_string_);
     return DragDropController::StartDragAndDrop(
         data, root_window, source_window, location, operation, source);
   }
 
-  void DragUpdate(aura::Window* target,
-                  const ui::LocatedEvent& event) OVERRIDE {
+  virtual void DragUpdate(aura::Window* target,
+                          const ui::LocatedEvent& event) OVERRIDE {
     DragDropController::DragUpdate(target, event);
     num_drag_updates_++;
   }
 
-  void Drop(aura::Window* target, const ui::LocatedEvent& event) OVERRIDE {
+  virtual void Drop(aura::Window* target,
+                    const ui::LocatedEvent& event) OVERRIDE {
     DragDropController::Drop(target, event);
     drop_received_ = true;
   }
 
-  void DragCancel() OVERRIDE {
+  virtual void DragCancel() OVERRIDE {
     DragDropController::DragCancel();
     drag_canceled_ = true;
   }
 
-  ui::LinearAnimation* CreateCancelAnimation(
+  virtual ui::LinearAnimation* CreateCancelAnimation(
       int duration,
       int frame_rate,
       ui::AnimationDelegate* delegate) OVERRIDE {
     return new CompletableLinearAnimation(duration, frame_rate, delegate);
   }
 
-  void DoDragCancel(int animation_duration_ms) OVERRIDE {
+  virtual void DoDragCancel(int animation_duration_ms) OVERRIDE {
     DragDropController::DoDragCancel(animation_duration_ms);
     drag_canceled_ = true;
   }
@@ -911,7 +913,7 @@ namespace {
 
 class DragImageWindowObserver : public aura::WindowObserver {
  public:
-  virtual void OnWindowDestroying(aura::Window* window) {
+  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
     window_location_on_destroying_ = window->GetBoundsInScreen().origin();
   }
 
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index 3c9a2d9..3d3efd4 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -104,7 +104,7 @@ class Launcher::DimmerView : public views::View,
     launcher_->widget()->GetNativeWindow()->AddObserver(this);
   }
 
-  ~DimmerView() {
+  virtual ~DimmerView() {
     if (launcher_)
       launcher_->widget()->GetNativeWindow()->RemoveObserver(this);
   }
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index c2cf286..04df4ee 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -60,12 +60,12 @@ class LauncherButton::BarView : public views::ImageView,
   }
 
   // View overrides.
-  bool HitTestRect(const gfx::Rect& rect) const OVERRIDE {
+  virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE {
     // Allow Mouse...() messages to go to the parent view.
     return false;
   }
 
-  void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     if (animation_.is_animating()) {
       int alpha = animation_.CurrentValueBetween(0, 255);
       canvas->SaveLayerAlpha(alpha);
@@ -77,7 +77,7 @@ class LauncherButton::BarView : public views::ImageView,
   }
 
   // ui::AnimationDelegate overrides.
-  void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
+  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
     SchedulePaint();
   }
 
diff --git a/ash/system/chromeos/network/tray_sms.cc b/ash/system/chromeos/network/tray_sms.cc
index a57e195..588cd4f 100644
--- a/ash/system/chromeos/network/tray_sms.cc
+++ b/ash/system/chromeos/network/tray_sms.cc
@@ -197,7 +197,7 @@ class TraySms::SmsDetailedView : public TrayDetailsView,
   }
 
   // Overridden from views::View.
-  gfx::Size GetPreferredSize() {
+  virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size preferred_size = TrayDetailsView::GetPreferredSize();
     if (preferred_size.height() < kMessageListMinHeight)
       preferred_size.set_height(kMessageListMinHeight);
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index d7c2621..dd75fed 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -133,7 +133,7 @@ class DisplayView : public ash::internal::ActionableView {
     return true;
   }
 
-  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) {
+  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE {
     int label_max_width = bounds().width() - kTrayPopupPaddingHorizontal * 2 -
         kTrayPopupPaddingBetweenItems - image_->GetPreferredSize().width();
     label_->SizeToFit(label_max_width);
diff --git a/ash/system/logout_button/tray_logout_button.cc b/ash/system/logout_button/tray_logout_button.cc
index fe68b23..73a6a83 100644
--- a/ash/system/logout_button/tray_logout_button.cc
+++ b/ash/system/logout_button/tray_logout_button.cc
@@ -112,7 +112,8 @@ class LogoutButton : public views::View,
   }
 
   // Overridden from views::ButtonListener.
-  void ButtonPressed(views::Button* sender, const ui::Event& event) OVERRIDE {
+  virtual void ButtonPressed(views::Button* sender,
+                             const ui::Event& event) OVERRIDE {
     DCHECK_EQ(sender, button_);
     Shell::GetInstance()->system_tray_delegate()->SignOut();
   }
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index 41e658f..74da625 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -35,7 +35,7 @@ class TestItem : public SystemTrayItem {
  public:
   TestItem() : SystemTrayItem(GetSystemTray()), tray_view_(NULL) {}
 
-  virtual views::View* CreateTrayView(user::LoginStatus status) {
+  virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE {
     tray_view_ = new views::View;
     // Add a label so it has non-zero width.
     tray_view_->SetLayoutManager(new views::FillLayout);
@@ -43,42 +43,44 @@ class TestItem : public SystemTrayItem {
     return tray_view_;
   }
 
-  virtual views::View* CreateDefaultView(user::LoginStatus status) {
+  virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE {
     default_view_ = new views::View;
     default_view_->SetLayoutManager(new views::FillLayout);
     default_view_->AddChildView(new views::Label(UTF8ToUTF16("Default")));
     return default_view_;
   }
 
-  virtual views::View* CreateDetailedView(user::LoginStatus status) {
+  virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE {
     detailed_view_ = new views::View;
     detailed_view_->SetLayoutManager(new views::FillLayout);
     detailed_view_->AddChildView(new views::Label(UTF8ToUTF16("Detailed")));
     return detailed_view_;
   }
 
-  virtual views::View* CreateNotificationView(user::LoginStatus status) {
+  virtual views::View* CreateNotificationView(
+      user::LoginStatus status) OVERRIDE {
     notification_view_ = new views::View;
     return notification_view_;
   }
 
-  virtual void DestroyTrayView() {
+  virtual void DestroyTrayView() OVERRIDE {
     tray_view_ = NULL;
   }
 
-  virtual void DestroyDefaultView() {
+  virtual void DestroyDefaultView() OVERRIDE {
     default_view_ = NULL;
   }
 
-  virtual void DestroyDetailedView() {
+  virtual void DestroyDetailedView() OVERRIDE {
     detailed_view_ = NULL;
   }
 
-  virtual void DestroyNotificationView() {
+  virtual void DestroyNotificationView() OVERRIDE {
     notification_view_ = NULL;
   }
 
-  virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) {
+  virtual void UpdateAfterLoginStatusChange(
+      user::LoginStatus status) OVERRIDE {
   }
 
   views::View* tray_view() const { return tray_view_; }
@@ -93,8 +95,8 @@ class TestItem : public SystemTrayItem {
   views::View* notification_view_;
 };
 
-// Trivial item implementation that returns NULL from tray/default/detailed view
-// creation methods.
+// Trivial item implementation that returns NULL from tray/default/detailed
+// view creation methods.
 class TestNoViewItem : public SystemTrayItem {
  public:
   TestNoViewItem() : SystemTrayItem(GetSystemTray()) {}
@@ -120,7 +122,8 @@ class TestNoViewItem : public SystemTrayItem {
   virtual void DestroyDefaultView() OVERRIDE {}
   virtual void DestroyDetailedView() OVERRIDE {}
   virtual void DestroyNotificationView() OVERRIDE {}
-  virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE {
+  virtual void UpdateAfterLoginStatusChange(
+      user::LoginStatus status) OVERRIDE {
   }
 };
 
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
index 1523a51..23ff2ff 100644
--- a/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -51,24 +51,24 @@ class TestDelegate : public message_center::MessageCenter::Delegate {
   }
 
   // WebNotificationTray::Delegate overrides.
-  virtual void NotificationRemoved(const std::string& notifcation_id) {
+  virtual void NotificationRemoved(const std::string& notifcation_id) OVERRIDE {
     notification_ids_.erase(notifcation_id);
   }
 
-  virtual void DisableExtension(const std::string& notifcation_id) {
+  virtual void DisableExtension(const std::string& notifcation_id) OVERRIDE {
   }
 
   virtual void DisableNotificationsFromSource(
-      const std::string& notifcation_id) {
+      const std::string& notifcation_id) OVERRIDE {
   }
 
-  virtual void ShowSettings(const std::string& notifcation_id) {
+  virtual void ShowSettings(const std::string& notifcation_id) OVERRIDE {
   }
 
-  virtual void ShowSettingsDialog(gfx::NativeView context) {
+  virtual void ShowSettingsDialog(gfx::NativeView context) OVERRIDE {
   }
 
-  virtual void OnClicked(const std::string& notifcation_id) {
+  virtual void OnClicked(const std::string& notifcation_id) OVERRIDE {
   }
 
   void AddNotification(WebNotificationTray* tray, const std::string& id) {
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index fae7d65..5b4a6b6 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -47,7 +47,7 @@ class AshEventGeneratorDelegate : public aura::test::EventGeneratorDelegate {
   virtual ~AshEventGeneratorDelegate() {}
 
   // aura::test::EventGeneratorDelegate overrides:
-  aura::RootWindow* GetRootWindowAt(
+  virtual aura::RootWindow* GetRootWindowAt(
       const gfx::Point& point_in_screen) const OVERRIDE {
     gfx::Screen* screen = Shell::GetInstance()->screen();
     gfx::Display display = screen->GetDisplayNearestPoint(point_in_screen);
@@ -55,7 +55,7 @@ class AshEventGeneratorDelegate : public aura::test::EventGeneratorDelegate {
         GetRootWindowForDisplayId(display.id());
   }
 
-  aura::client::ScreenPositionClient* GetScreenPositionClient(
+  virtual aura::client::ScreenPositionClient* GetScreenPositionClient(
       const aura::Window* window) const OVERRIDE {
     return aura::client::GetScreenPositionClient(window->GetRootWindow());
   }
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index 60aed7c..8c187b6 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -111,7 +111,7 @@ class TooltipController::Tooltip : public views::WidgetObserver {
     label_.set_owned_by_client();
   }
 
-  ~Tooltip() {
+  virtual ~Tooltip() {
     if (widget_) {
       widget_->RemoveObserver(this);
       widget_->Close();
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index f05c15b..f594de4 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -33,7 +33,8 @@ class TooltipTestView : public views::View {
   void set_tooltip_text(string16 tooltip_text) { tooltip_text_ = tooltip_text; }
 
   // Overridden from views::View
-  bool GetTooltipText(const gfx::Point& p, string16* tooltip) const {
+  virtual bool GetTooltipText(const gfx::Point& p,
+                              string16* tooltip) const OVERRIDE {
     *tooltip = tooltip_text_;
     return true;
   }
diff --git a/ash/wm/base_layout_manager_unittest.cc b/ash/wm/base_layout_manager_unittest.cc
index 3093de9..3aa4a11 100644
--- a/ash/wm/base_layout_manager_unittest.cc
+++ b/ash/wm/base_layout_manager_unittest.cc
@@ -89,7 +89,7 @@ class FocusDelegate : public aura::test::TestWindowDelegate {
   void set_window(aura::Window* window) { window_ = window; }
 
   // aura::test::TestWindowDelegate overrides:
-  virtual void OnWindowTargetVisibilityChanged(bool visible) {
+  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {
     if (window_) {
       if (visible)
         window_->Focus();
diff --git a/ash/wm/custom_frame_view_ash_unittest.cc b/ash/wm/custom_frame_view_ash_unittest.cc
index b387cb4..e404b9a 100644
--- a/ash/wm/custom_frame_view_ash_unittest.cc
+++ b/ash/wm/custom_frame_view_ash_unittest.cc
@@ -40,7 +40,7 @@ class ShellViewsDelegate : public views::TestViewsDelegate {
       views::Widget* widget) OVERRIDE {
     return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
   }
-  bool UseTransparentWindows() const OVERRIDE {
+  virtual bool UseTransparentWindows() const OVERRIDE {
     // Ash uses transparent window frames.
     return true;
   }
diff --git a/ash/wm/maximize_bubble_controller.cc b/ash/wm/maximize_bubble_controller.cc
index be2c63b..e601882 100644
--- a/ash/wm/maximize_bubble_controller.cc
+++ b/ash/wm/maximize_bubble_controller.cc
@@ -195,7 +195,7 @@ class BubbleMouseWatcherHost: public views::MouseWatcherHost {
 
   // Implementation of MouseWatcherHost.
   virtual bool Contains(const gfx::Point& screen_point,
-                        views::MouseWatcherHost::MouseEventType type);
+                        views::MouseWatcherHost::MouseEventType type) OVERRIDE;
  private:
   MaximizeBubbleController::Bubble* bubble_;
 
@@ -226,7 +226,7 @@ class MaximizeBubbleController::Bubble : public views::BubbleDelegateView,
   virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE;
 
   // Implementation of MouseWatcherListener.
-  virtual void MouseMovedOutOfHost();
+  virtual void MouseMovedOutOfHost() OVERRIDE;
 
   // Implementation of MouseWatcherHost.
   virtual bool Contains(const gfx::Point& screen_point,
diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc
index e92d807..03116e7 100644
--- a/ash/wm/partial_screenshot_view.cc
+++ b/ash/wm/partial_screenshot_view.cc
@@ -61,7 +61,7 @@ class PartialScreenshotView::OverlayDelegate
   }
 
   // Overridden from views::WidgetObserver:
-  virtual void OnWidgetDestroying(views::Widget* widget) {
+  virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE {
     widget->RemoveObserver(this);
     widgets_.erase(std::remove(widgets_.begin(), widgets_.end(), widget));
     if (widgets_.empty())
diff --git a/ash/wm/session_state_controller_impl2_unittest.cc b/ash/wm/session_state_controller_impl2_unittest.cc
index 985ed89..bae1f14 100644
--- a/ash/wm/session_state_controller_impl2_unittest.cc
+++ b/ash/wm/session_state_controller_impl2_unittest.cc
@@ -137,7 +137,7 @@ class SessionStateControllerImpl2Test : public AshTestBase {
         ash::Shell::GetInstance()->delegate());
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     // TODO(antrim) : restore
     // animator_helper_->AdvanceUntilDone();
     AshTestBase::TearDown();
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 8a9754d..06e9b10 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -49,7 +49,7 @@ class DontClobberRestoreBoundsWindowObserver : public aura::WindowObserver {
 
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
-                                       intptr_t old) {
+                                       intptr_t old) OVERRIDE {
     if (!window_)
       return;