diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 23:53:36 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-10 23:53:36 +0000 |
| commit | f574e6727a27ac819480246a8541b2acc1394ae7 (patch) | |
| tree | b28bfbb4ef4153b555ebffe79dc76079911eeb9b /views/widget/widget_win.h | |
| parent | 0c2cba5686b58a90173084128b0e0b3b8534b995 (diff) | |
| download | chromium_src-f574e6727a27ac819480246a8541b2acc1394ae7.zip chromium_src-f574e6727a27ac819480246a8541b2acc1394ae7.tar.gz chromium_src-f574e6727a27ac819480246a8541b2acc1394ae7.tar.bz2 | |
views: Include base/win/scope_comptr.h instead of base/scoped_comptr_win.h
Also add base::win:: to ScopedComPtr where necessary.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/5625006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/widget_win.h')
| -rw-r--r-- | views/widget/widget_win.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h index 8b85e47..0c9f1b0 100644 --- a/views/widget/widget_win.h +++ b/views/widget/widget_win.h @@ -15,8 +15,8 @@ #include <vector> #include "base/message_loop.h" -#include "base/scoped_comptr_win.h" #include "base/scoped_vector.h" +#include "base/win/scoped_comptr.h" #include "gfx/window_impl.h" #include "views/focus/focus_manager.h" #include "views/layout_manager.h" @@ -570,7 +570,7 @@ class WidgetWin : public gfx::WindowImpl, bool restore_focus_when_enabled_; // Instance of accessibility information and handling for MSAA root - ScopedComPtr<IAccessible> accessibility_root_; + base::win::ScopedComPtr<IAccessible> accessibility_root_; scoped_ptr<DefaultThemeProvider> default_theme_provider_; |