Revert 117499 - Aura compile issues under clang

Fixes misc clang/style errors for Aura sources.  This should be the last
of them.

BUG=109946
TEST=Compiles under mac/clang.
R=sky@chromium.org

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

TBR=dhollowa@chromium.org
Review URL: http://codereview.chromium.org/9186049

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

6 files changed, 11 insertions, 12 deletions

diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
index 2b3539e..069b513 100644
--- a/ash/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -28,7 +28,7 @@ class LauncherModel;
 class ASH_EXPORT Launcher : public aura::WindowObserver {
  public:
   explicit Launcher(aura::Window* window_container);
-  virtual ~Launcher();
+  ~Launcher();
 
   // Sets the width of the status area.
   void SetStatusWidth(int width);
diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h
index 2246ad5..2d1eb34 100644
--- a/ash/tooltips/tooltip_controller.h
+++ b/ash/tooltips/tooltip_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -39,7 +39,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient,
   virtual ~TooltipController();
 
   // Overridden from aura::client::TooltipClient.
-  virtual void UpdateTooltip(aura::Window* target) OVERRIDE;
+  void UpdateTooltip(aura::Window* target);
 
   // Overridden from aura::EventFilter.
   virtual bool PreHandleKeyEvent(aura::Window* target,
diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h
index a0e0bc5..8cb8704 100644
--- a/ash/wm/power_button_controller.h
+++ b/ash/wm/power_button_controller.h
@@ -125,7 +125,7 @@ class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver {
   };
 
   PowerButtonController();
-  virtual ~PowerButtonController();
+  ~PowerButtonController();
 
   void set_delegate(PowerButtonControllerDelegate* delegate) {
     delegate_.reset(delegate);
diff --git a/ui/aura/client/drag_drop_delegate.cc b/ui/aura/client/drag_drop_delegate.cc
index c9f4e88..1cc75f6 100644
--- a/ui/aura/client/drag_drop_delegate.cc
+++ b/ui/aura/client/drag_drop_delegate.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -21,4 +21,4 @@ DragDropDelegate* GetDragDropDelegate(Window* window) {
 }
 
 }  // namespace client
-}  // namespace aura
+}  // namespace aura
\ No newline at end of file
diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h
index 7b1f447..5214654 100644
--- a/ui/views/controls/button/text_button.h
+++ b/ui/views/controls/button/text_button.h
@@ -111,8 +111,8 @@ class VIEWS_EXPORT TextButtonNativeThemeBorder : public Border {
 //
 // TextButtonBase
 //
-//  A base class for different types of buttons, like push buttons, radio
-//  buttons, and checkboxes, that do not depend on native components for
+//  A base ckass for different types of buttons, like push buttons, radio
+//  buttons, and checkboxes, that do not depende on native components for
 //  look and feel. TextButton reserves space for the largest string
 //  passed to SetText. To reset the cached max size invoke ClearMaxTextSize.
 //
diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.cc b/ui/views/controls/scrollbar/base_scroll_bar_button.cc
index e78c13b..5efef6e 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar_button.cc
+++ b/ui/views/controls/scrollbar/base_scroll_bar_button.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -34,12 +34,11 @@ void BaseScrollBarButton::OnMouseCaptureLost() {
 }
 
 void BaseScrollBarButton::RepeaterNotifyClick() {
-  // TODO(sky): See if we can convert to using |Screen| everywhere.
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
   DWORD pos = GetMessagePos();
   POINTS points = MAKEPOINTS(pos);
   gfx::Point cursor_point(points.x, points.y);
-#else
+#elif defined(OS_LINUX)
   gfx::Point cursor_point = gfx::Screen::GetCursorScreenPoint();
 #endif
   views::MouseEvent event(ui::ET_MOUSE_RELEASED,