views: Remove unnecessary include of combobox.h from native_control_win.h

While I'm here also remove scoped_ptr.h include (which is also unused) and
annotate with OVERRIDE the overridden methods.

R=sky@chromium.org

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

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

2 files changed, 19 insertions, 16 deletions

diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index 9d1af49..4a450f0 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -11,14 +11,15 @@
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
+#include "views/controls/combobox/combobox.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 using ui::ViewProp;
 
-namespace views {
+const char kNativeControlWinKey[] = "__NATIVE_CONTROL_WIN__";
 
-static const char* const kNativeControlWinKey = "__NATIVE_CONTROL_WIN__";
+namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeControlWin, public:
@@ -108,7 +109,7 @@ void NativeControlWin::OnFocus() {
   // a native win32 control, we don't always send a native (MSAA)
   // focus notification.
   bool send_native_event =
-      parent_view->GetClassName() != views::Combobox::kViewClassName &&
+      parent_view->GetClassName() != Combobox::kViewClassName &&
       parent_view->HasFocus();
 
   // Send the accessibility focus notification.
diff --git a/views/controls/native_control_win.h b/views/controls/native_control_win.h
index d58a77b..a40b02f 100644
--- a/views/controls/native_control_win.h
+++ b/views/controls/native_control_win.h
@@ -6,9 +6,9 @@
 #define VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
 #pragma once
 
-#include "base/memory/scoped_ptr.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
-#include "views/controls/combobox/combobox.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/widget/child_window_message_processor.h"
 
@@ -25,24 +25,26 @@ class NativeControlWin : public ChildWindowMessageProcessor,
   NativeControlWin();
   virtual ~NativeControlWin();
 
-  // Overridden from ChildWindowMessageProcessor:
-  virtual bool ProcessMessage(UINT message,
-                              WPARAM w_param,
-                              LPARAM l_param,
-                              LRESULT* result);
-
   // Called by our subclassed window procedure when a WM_KEYDOWN message is
   // received by the HWND created by an object derived from NativeControlWin.
   // Returns true if the key was processed, false otherwise.
   virtual bool OnKeyDown(int vkey) { return false; }
 
+  // Overridden from ChildWindowMessageProcessor:
+  virtual bool ProcessMessage(UINT message,
+                              WPARAM w_param,
+                              LPARAM l_param,
+                              LRESULT* result) OVERRIDE;
+
   // Overridden from View:
-  virtual void OnEnabledChanged();
+  virtual void OnEnabledChanged() OVERRIDE;
 
  protected:
-  virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child);
-  virtual void VisibilityChanged(View* starting_from, bool is_visible);
-  virtual void OnFocus();
+  virtual void ViewHierarchyChanged(bool is_add,
+                                    View* parent,
+                                    View* child) OVERRIDE;
+  virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
+  virtual void OnFocus() OVERRIDE;
 
   // Called by the containing NativeWidgetWin when a WM_CONTEXTMENU message is
   // received from the HWND created by an object derived from NativeControlWin.
@@ -96,4 +98,4 @@ class NativeControlWin : public ChildWindowMessageProcessor,
 
 }  // namespace views
 
-#endif  // #ifndef VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
+#endif  // VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_