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

Unified Diff: ui/views/controls/textfield/textfield_unittest.cc

Issue 1207973002: Fixes for views_unittests on Mac after InputMethodBridge removal (DO NOT COMMIT) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150625-IMERefactorMac-UPSTREAM
Patch Set: Created 5 years, 6 months 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
Index: ui/views/controls/textfield/textfield_unittest.cc
diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc
index 11745e2b244a7dac7ae01e1e80b171c88c7f06d8..69d5d2c453364d21373727da6ccd094f7a5bd226 100644
--- a/ui/views/controls/textfield/textfield_unittest.cc
+++ b/ui/views/controls/textfield/textfield_unittest.cc
@@ -13,8 +13,6 @@
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/accessibility/ax_view_state.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#include "ui/base/dragdrop/drag_drop_types.h"
@@ -409,8 +407,8 @@ class TextfieldTest : public ViewsTestBase, public TextfieldController {
params.bounds = gfx::Rect(100, 100, 100, 100);
widget_->Init(params);
- input_method_->SetDelegate(static_cast<ui::internal::InputMethodDelegate*>(
- widget_->GetNativeWindow()->GetRootWindow()->GetHost()));
+ input_method_->SetDelegate(
+ test::WidgetTest::GetInputMethodDelegateForWidget(widget_));
View* container = new View();
widget_->SetContentsView(container);
container->AddChildView(textfield_);

Powered by Google App Engine
This is Rietveld 408576698