Redesigns the text input focus handling.

ui/views/controls/webview/webview_interactive_uitest.cc

+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/views/controls/webview/webview.h"
+
+#include "base/command_line.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/path_service.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/test/test_browser_context.h"
+#include "ui/base/ime/text_input_focus_manager.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_switches.h"
+#include "ui/gl/gl_surface.h"
+#include "ui/views/test/webview_test_helper.h"
+#include "ui/views/test/widget_test.h"
+
+namespace {
+
+class WebViewInteractiveUiTest : public views::test::WidgetTest {
+ public:
+  virtual void SetUp() OVERRIDE {
+    gfx::GLSurface::InitializeOneOffForTests();
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
+    WidgetTest::SetUp();
+  }
+
+ protected:
+  content::BrowserContext* browser_context() { return &browser_context_; }
+
+ private:
+  content::TestBrowserContext browser_context_;
+  views::WebViewTestHelper webview_test_helper_;
+};

[sky, 2014/05/01 15:21:19]

DISALLOW_...

[Yuki, 2014/05/02 06:38:11]

Done.

+
+#if defined(USE_AURA)

[sky, 2014/05/01 15:21:19]

You shouldn't need this ifdef anymore.

[Yuki, 2014/05/02 06:38:11]

Done.

+TEST_F(WebViewInteractiveUiTest, TextInputClientIsUpToDate) {
+  // WebViewInteractiveUiTest.TextInputClientIsUpToDate needs
+  // kEnableTextInputFocusManager flag to be enabled.
+  base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+  cmd_line->AppendSwitch(switches::kEnableTextInputFocusManager);
+
+  // Create a top level widget and a webview as its content.
+  views::Widget* widget = CreateTopLevelFramelessPlatformWidget();
+  views::WebView* webview = new views::WebView(browser_context());
+  widget->SetContentsView(webview);
+  widget->Show();
+  webview->RequestFocus();
+
+  ui::TextInputFocusManager* text_input_focus_manager =
+      ui::TextInputFocusManager::GetInstance();
+  const ui::TextInputClient* null_text_input_client = NULL;
+  EXPECT_EQ(null_text_input_client, webview->GetTextInputClient());
+  EXPECT_EQ(text_input_focus_manager->GetFocusedTextInputClient(),
+            webview->GetTextInputClient());
+
+  // Case 1: Creates a new WebContents.
+  webview->GetWebContents();
+  webview->RequestFocus();
+  ui::TextInputClient* client1 = webview->GetTextInputClient();
+  EXPECT_NE(null_text_input_client, client1);
+  EXPECT_EQ(text_input_focus_manager->GetFocusedTextInputClient(), client1);
+
+  // Case 2: Replaces a WebContents by SetWebContents().
+  content::WebContents::CreateParams params(browser_context());
+  scoped_ptr<content::WebContents> web_contents(
+      content::WebContents::Create(params));
+  webview->SetWebContents(web_contents.get());
+  ui::TextInputClient* client2 = webview->GetTextInputClient();
+  EXPECT_NE(null_text_input_client, client2);
+  EXPECT_EQ(text_input_focus_manager->GetFocusedTextInputClient(), client2);
+  EXPECT_NE(client1, client2);
+
+  widget->Close();
+  RunPendingMessages();
+}
+#endif  // defined(USE_AURA)
+
+}  // namespace