| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/extensions/extension_test_message_listener.h" | 6 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 7 #include "chrome/browser/extensions/platform_app_browsertest_util.h" | 7 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
| 8 #include "chrome/browser/extensions/shell_window_registry.h" | 8 #include "chrome/browser/extensions/shell_window_registry.h" |
| 9 #include "chrome/browser/ui/extensions/shell_window.h" | 9 #include "chrome/browser/ui/extensions/shell_window.h" |
| 10 #include "chrome/test/base/interactive_test_utils.h" | 10 #include "chrome/test/base/interactive_test_utils.h" |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 message_loop_ = new content::MessageLoopRunner; | 174 message_loop_ = new content::MessageLoopRunner; |
| 175 message_loop_->Run(); | 175 message_loop_->Run(); |
| 176 } | 176 } |
| 177 content::RenderWidgetHost* last_render_widget_host() { | 177 content::RenderWidgetHost* last_render_widget_host() { |
| 178 return last_render_widget_host_; | 178 return last_render_widget_host_; |
| 179 } | 179 } |
| 180 | 180 |
| 181 private: | 181 private: |
| 182 void CreatedCallback(content::RenderWidgetHost* rwh) { | 182 void CreatedCallback(content::RenderWidgetHost* rwh) { |
| 183 last_render_widget_host_ = rwh; | 183 last_render_widget_host_ = rwh; |
| 184 if (message_loop_) | 184 if (message_loop_.get()) |
| 185 message_loop_->Quit(); | 185 message_loop_->Quit(); |
| 186 else | 186 else |
| 187 created_ = true; | 187 created_ = true; |
| 188 } | 188 } |
| 189 content::RenderWidgetHost::CreatedCallback created_callback_; | 189 content::RenderWidgetHost::CreatedCallback created_callback_; |
| 190 scoped_refptr<content::MessageLoopRunner> message_loop_; | 190 scoped_refptr<content::MessageLoopRunner> message_loop_; |
| 191 bool created_; | 191 bool created_; |
| 192 content::RenderWidgetHost* last_render_widget_host_; | 192 content::RenderWidgetHost* last_render_widget_host_; |
| 193 }; | 193 }; |
| 194 | 194 |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 414 // Started flakily failing after a Blink roll: http://crbug.com/245332 | 414 // Started flakily failing after a Blink roll: http://crbug.com/245332 |
| 415 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, DISABLED_PopupPositioningMoved) { | 415 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, DISABLED_PopupPositioningMoved) { |
| 416 SetupTest( | 416 SetupTest( |
| 417 "web_view/popup_positioning_moved", | 417 "web_view/popup_positioning_moved", |
| 418 "files/extensions/platform_apps/web_view/popup_positioning_moved" | 418 "files/extensions/platform_apps/web_view/popup_positioning_moved" |
| 419 "/guest.html"); | 419 "/guest.html"); |
| 420 ASSERT_TRUE(guest_web_contents()); | 420 ASSERT_TRUE(guest_web_contents()); |
| 421 | 421 |
| 422 PopupTestHelper(gfx::Point(20, 0)); | 422 PopupTestHelper(gfx::Point(20, 0)); |
| 423 } | 423 } |
| OLD | NEW |