diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 21:04:22 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 21:04:22 +0000 |
| commit | bdd543c265c188c5ff77ae304434276b492970cd (patch) | |
| tree | cc7e99f6c8912dc82438d2ec212c5e9883ac331c /views/focus | |
| parent | 8c20e3d273ad6c64bd033557bb52f2cb8f62898b (diff) | |
| download | chromium_src-bdd543c265c188c5ff77ae304434276b492970cd.zip chromium_src-bdd543c265c188c5ff77ae304434276b492970cd.tar.gz chromium_src-bdd543c265c188c5ff77ae304434276b492970cd.tar.bz2 | |
Rename WindowWin|Gtk->NativeWindowWin|Gtk
BUG=72040
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/7048006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus')
| -rw-r--r-- | views/focus/accelerator_handler_gtk_unittest.cc | 3 | ||||
| -rw-r--r-- | views/focus/focus_manager_gtk.cc | 1 | ||||
| -rw-r--r-- | views/focus/focus_manager_unittest.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/views/focus/accelerator_handler_gtk_unittest.cc b/views/focus/accelerator_handler_gtk_unittest.cc index bfe53a9..3996e77 100644 --- a/views/focus/accelerator_handler_gtk_unittest.cc +++ b/views/focus/accelerator_handler_gtk_unittest.cc @@ -7,8 +7,9 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect.h" #include "views/focus/accelerator_handler.h" +#include "views/focus/focus_manager.h" #include "views/view.h" -#include "views/window/window_gtk.h" +#include "views/window/window.h" #include "views/window/window_delegate.h" namespace views { diff --git a/views/focus/focus_manager_gtk.cc b/views/focus/focus_manager_gtk.cc index 98438c4..399ddc4 100644 --- a/views/focus/focus_manager_gtk.cc +++ b/views/focus/focus_manager_gtk.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "views/widget/native_widget_gtk.h" -#include "views/window/window_gtk.h" namespace views { diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc index c215c72..d8122c2 100644 --- a/views/focus/focus_manager_unittest.cc +++ b/views/focus/focus_manager_unittest.cc @@ -1677,7 +1677,7 @@ class FocusManagerDtorTest : public FocusManagerTest { } virtual ~WindowDtorTracked() { - dtor_tracker_->push_back("WindowGtkDtorTracked"); + dtor_tracker_->push_back("WindowDtorTracked"); } FocusManagerDtorTracked* tracked_focus_manager_; @@ -1686,7 +1686,7 @@ class FocusManagerDtorTest : public FocusManagerTest { public: virtual void SetUp() { - // Create WindowGtkDtorTracked that uses FocusManagerDtorTracked. + // Create WindowDtorTracked that uses FocusManagerDtorTracked. window_ = new WindowDtorTracked(this, &dtor_tracker_); ASSERT_TRUE(GetFocusManager() == static_cast<WindowDtorTracked*>( window_)->tracked_focus_manager_); |