| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "apps/shell_window.h" | 5 #include "apps/shell_window.h" |
| 6 #include "apps/shell_window_registry.h" | 6 #include "apps/shell_window_registry.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 | 251 |
| 252 content::WebContents* embedder_web_contents() { | 252 content::WebContents* embedder_web_contents() { |
| 253 return embedder_web_contents_; | 253 return embedder_web_contents_; |
| 254 } | 254 } |
| 255 | 255 |
| 256 gfx::Point corner() { | 256 gfx::Point corner() { |
| 257 return corner_; | 257 return corner_; |
| 258 } | 258 } |
| 259 | 259 |
| 260 void SimulateRWHMouseClick(content::RenderWidgetHost* rwh, int x, int y) { | 260 void SimulateRWHMouseClick(content::RenderWidgetHost* rwh, int x, int y) { |
| 261 WebKit::WebMouseEvent mouse_event; | 261 blink::WebMouseEvent mouse_event; |
| 262 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; | 262 mouse_event.button = blink::WebMouseEvent::ButtonLeft; |
| 263 mouse_event.x = mouse_event.windowX = x; | 263 mouse_event.x = mouse_event.windowX = x; |
| 264 mouse_event.y = mouse_event.windowY = y; | 264 mouse_event.y = mouse_event.windowY = y; |
| 265 mouse_event.modifiers = 0; | 265 mouse_event.modifiers = 0; |
| 266 | 266 |
| 267 mouse_event.type = WebKit::WebInputEvent::MouseDown; | 267 mouse_event.type = blink::WebInputEvent::MouseDown; |
| 268 rwh->ForwardMouseEvent(mouse_event); | 268 rwh->ForwardMouseEvent(mouse_event); |
| 269 mouse_event.type = WebKit::WebInputEvent::MouseUp; | 269 mouse_event.type = blink::WebInputEvent::MouseUp; |
| 270 rwh->ForwardMouseEvent(mouse_event); | 270 rwh->ForwardMouseEvent(mouse_event); |
| 271 } | 271 } |
| 272 | 272 |
| 273 class PopupCreatedObserver { | 273 class PopupCreatedObserver { |
| 274 public: | 274 public: |
| 275 PopupCreatedObserver() : created_(false), last_render_widget_host_(NULL) { | 275 PopupCreatedObserver() : created_(false), last_render_widget_host_(NULL) { |
| 276 created_callback_ = base::Bind( | 276 created_callback_ = base::Bind( |
| 277 &PopupCreatedObserver::CreatedCallback, base::Unretained(this)); | 277 &PopupCreatedObserver::CreatedCallback, base::Unretained(this)); |
| 278 content::RenderWidgetHost::AddCreatedCallback(created_callback_); | 278 content::RenderWidgetHost::AddCreatedCallback(created_callback_); |
| 279 } | 279 } |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 | 767 |
| 768 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 768 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
| 769 } | 769 } |
| 770 | 770 |
| 771 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, | 771 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
| 772 PointerLock_PointerLockLostWithFocus) { | 772 PointerLock_PointerLockLostWithFocus) { |
| 773 TestHelper("testPointerLockLostWithFocus", | 773 TestHelper("testPointerLockLostWithFocus", |
| 774 "web_view/pointerlock", | 774 "web_view/pointerlock", |
| 775 NO_TEST_SERVER); | 775 NO_TEST_SERVER); |
| 776 } | 776 } |
| OLD | NEW |