diff options
| author | mthiesse@chromium.org <mthiesse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 22:27:53 +0000 |
|---|---|---|
| committer | mthiesse@chromium.org <mthiesse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 22:27:53 +0000 |
| commit | 1222c1e5f684d98391b53352a995a236b9e4409b (patch) | |
| tree | b2a6afca1faa18c7fad110f61514adcb56f44131 /chrome/browser/extensions/platform_app_browsertest.cc | |
| parent | 83dea2b1f0e4700854b8272b8593a3d6a4aa3c5b (diff) | |
| download | chromium_src-1222c1e5f684d98391b53352a995a236b9e4409b.zip chromium_src-1222c1e5f684d98391b53352a995a236b9e4409b.tar.gz chromium_src-1222c1e5f684d98391b53352a995a236b9e4409b.tar.bz2 | |
Change RenderWidgetHostViewGtk::HasFocus() to check global focus instead of top-level focus.
See http://people.gnome.org/~shaunm/girdoc/C/Gtk.Widget.is_focus.html vs http://people.gnome.org/~shaunm/girdoc/C/Gtk.Widget.has_focus.html
BUG=172623
TEST=Please manually check via https://crbug.com/172623 description.
Review URL: https://chromiumcodereview.appspot.com/12377084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/platform_app_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/platform_app_browsertest.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc index 7bc4a77..f80abe4 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/extensions/platform_app_browsertest.cc @@ -793,10 +793,15 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_Messaging) { #define MAYBE_WebContentsHasFocus WebContentsHasFocus #endif IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_WebContentsHasFocus) { - const Extension* extension = LoadAndLaunchPlatformApp("minimal"); - ShellWindow* window = CreateShellWindow(extension); - EXPECT_TRUE(window->web_contents()->GetRenderWidgetHostView()->HasFocus()); - CloseShellWindow(window); + ExtensionTestMessageListener launched_listener("Launched", true); + LoadAndLaunchPlatformApp("minimal"); + ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); + + EXPECT_EQ(1LU, GetShellWindowCount()); + ShellWindowRegistry::ShellWindowSet shell_windows = ShellWindowRegistry::Get( + browser()->profile())->shell_windows(); + EXPECT_TRUE((*shell_windows.begin())->web_contents()-> + GetRenderWidgetHostView()->HasFocus()); } } // namespace extensions |