Index: views/controls/native_control_win.h |
diff --git a/views/controls/native_control_win.h b/views/controls/native_control_win.h |
index 3733a150499eafc0265ac1fa78f44af92db41dc7..d27efa4d60c49399567f608867c8b5b4bf5fb912 100644 |
--- a/views/controls/native_control_win.h |
+++ b/views/controls/native_control_win.h |
@@ -13,9 +13,7 @@ |
#include "views/widget/child_window_message_processor.h" |
namespace app { |
-namespace win { |
-class ScopedProp; |
-} |
+class ViewProp; |
} |
namespace views { |
@@ -75,7 +73,7 @@ class NativeControlWin : public ChildWindowMessageProcessor, |
DWORD GetAdditionalRTLStyle() const; |
private: |
- typedef ScopedVector<app::win::ScopedProp> ScopedProps; |
+ typedef ScopedVector<app::ViewProp> ViewProps; |
// Called by the containing WidgetWin when a message of type WM_CTLCOLORBTN or |
// WM_CTLCOLORSTATIC is sent from the HWND created by an object dreived from |
@@ -91,7 +89,7 @@ class NativeControlWin : public ChildWindowMessageProcessor, |
// The window procedure before we subclassed. |
WNDPROC original_wndproc_; |
- ScopedProps props_; |
+ ViewProps props_; |
DISALLOW_COPY_AND_ASSIGN(NativeControlWin); |
}; |