diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 20:03:34 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 20:03:34 +0000 |
| commit | 83421477bc9698c3f0c9de41764eb85dfc162ba7 (patch) | |
| tree | 5bd1d315da95e1c907e3145574d3b3ce18a056ae /views | |
| parent | 78fa96de8a0a6112d5aea2a42241427f6becc9c8 (diff) | |
| download | chromium_src-83421477bc9698c3f0c9de41764eb85dfc162ba7.zip chromium_src-83421477bc9698c3f0c9de41764eb85dfc162ba7.tar.gz chromium_src-83421477bc9698c3f0c9de41764eb85dfc162ba7.tar.bz2 | |
Move WindowImpl to gfx so I can use it there for canvas unit tests.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2813042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/menu_win.cc | 4 | ||||
| -rw-r--r-- | views/controls/scrollbar/native_scroll_bar_win.cc | 4 | ||||
| -rw-r--r-- | views/widget/widget_win.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index 5c976d5..05ada25 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -8,7 +8,6 @@ #include "app/l10n_util.h" #include "app/l10n_util_win.h" -#include "app/win/window_impl.h" #include "base/keyboard_codes.h" #include "base/logging.h" #include "base/stl_util-inl.h" @@ -16,6 +15,7 @@ #include "gfx/canvas_skia.h" #include "gfx/font.h" #include "gfx/rect.h" +#include "gfx/window_impl.h" #include "views/accelerator.h" namespace views { @@ -62,7 +62,7 @@ static int ChromeGetMenuItemID(HMENU hMenu, int pos) { // to intercept right clicks on the HMENU and notify the delegate as well as // for drawing icons. // -class MenuHostWindow : public app::WindowImpl { +class MenuHostWindow : public gfx::WindowImpl { public: MenuHostWindow(MenuWin* menu, HWND parent_window) : menu_(menu) { int extended_style = 0; diff --git a/views/controls/scrollbar/native_scroll_bar_win.cc b/views/controls/scrollbar/native_scroll_bar_win.cc index b3018e3..e434b99 100644 --- a/views/controls/scrollbar/native_scroll_bar_win.cc +++ b/views/controls/scrollbar/native_scroll_bar_win.cc @@ -7,9 +7,9 @@ #include <algorithm> #include <string> -#include "app/win/window_impl.h" #include "base/keyboard_codes.h" #include "base/message_loop.h" +#include "gfx/window_impl.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/controls/scrollbar/scroll_bar.h" #include "views/widget/widget.h" @@ -24,7 +24,7 @@ namespace views { // use instances of this class to wrap native scrollbars. // ///////////////////////////////////////////////////////////////////////////// -class ScrollBarContainer : public app::WindowImpl { +class ScrollBarContainer : public gfx::WindowImpl { public: explicit ScrollBarContainer(ScrollBar* parent) : parent_(parent), diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h index 866cc70..f52cf6f 100644 --- a/views/widget/widget_win.h +++ b/views/widget/widget_win.h @@ -12,9 +12,9 @@ #include <vector> -#include "app/win/window_impl.h" #include "base/message_loop.h" #include "base/scoped_comptr_win.h" +#include "gfx/window_impl.h" #include "views/focus/focus_manager.h" #include "views/layout_manager.h" #include "views/widget/widget.h" @@ -68,7 +68,7 @@ const int WM_NCUAHDRAWFRAME = 0xAF; // then responsible for cleaning up after it. // /////////////////////////////////////////////////////////////////////////////// -class WidgetWin : public app::WindowImpl, +class WidgetWin : public gfx::WindowImpl, public Widget, public MessageLoopForUI::Observer, public FocusTraversable { |