Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Unified Diff: ui/views/corewm/input_method_event_filter_unittest.cc

Issue 11275139: Move ui\aura\shared to ui\views\corewm (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/corewm/input_method_event_filter.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/input_method_event_filter_unittest.cc
===================================================================
--- ui/views/corewm/input_method_event_filter_unittest.cc (revision 167200)
+++ ui/views/corewm/input_method_event_filter_unittest.cc (working copy)
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/aura/shared/input_method_event_filter.h"
+#include "ui/views/corewm/input_method_event_filter.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/client/activation_client.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/root_window.h"
-#include "ui/aura/shared/compound_event_filter.h"
+#include "ui/views/corewm/compound_event_filter.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/test/test_activation_client.h"
@@ -23,24 +23,23 @@
DISABLED_TestInputMethodKeyEventPropagation
#endif
-namespace aura {
-namespace test {
+namespace views {
+namespace corewm {
-typedef AuraTestBase InputMethodEventFilterTest;
+typedef aura::test::AuraTestBase InputMethodEventFilterTest;
TEST_F(InputMethodEventFilterTest, TestInputMethodProperty) {
- aura::shared::CompoundEventFilter* root_filter =
- new aura::shared::CompoundEventFilter;
+ CompoundEventFilter* root_filter = new CompoundEventFilter;
root_window()->SetEventFilter(root_filter);
// Add the InputMethodEventFilter before the TestEventFilter.
- aura::shared::InputMethodEventFilter input_method_event_filter;
+ InputMethodEventFilter input_method_event_filter;
root_filter->AddFilter(&input_method_event_filter);
// Tests if InputMethodEventFilter adds a window property on its
// construction.
- EXPECT_TRUE(
- root_window()->GetProperty(aura::client::kRootWindowInputMethodKey));
+ EXPECT_TRUE(root_window()->GetProperty(
+ aura::client::kRootWindowInputMethodKey));
root_filter->RemoveFilter(&input_method_event_filter);
}
@@ -48,12 +47,11 @@
// Tests if InputMethodEventFilter dispatches a ui::ET_TRANSLATED_KEY_* event to
// the root window.
TEST_F(InputMethodEventFilterTest, TestInputMethodKeyEventPropagation) {
- aura::shared::CompoundEventFilter* root_filter =
- new shared::CompoundEventFilter;
+ CompoundEventFilter* root_filter = new CompoundEventFilter;
root_window()->SetEventFilter(root_filter);
// Add the InputMethodEventFilter before the TestEventFilter.
- aura::shared::InputMethodEventFilter input_method_event_filter;
+ InputMethodEventFilter input_method_event_filter;
root_filter->AddFilter(&input_method_event_filter);
// Add TestEventFilter to the RootWindow.
@@ -89,5 +87,5 @@
window.reset();
}
-} // namespace test
-} // namespace aura
+} // namespace corewm
+} // namespace views
« no previous file with comments | « ui/views/corewm/input_method_event_filter.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698