| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 NavigateToURL(shell(), test_url); | 265 NavigateToURL(shell(), test_url); |
| 266 | 266 |
| 267 WebContentsImpl* web_contents = | 267 WebContentsImpl* web_contents = |
| 268 static_cast<WebContentsImpl*>(shell()->web_contents()); | 268 static_cast<WebContentsImpl*>(shell()->web_contents()); |
| 269 NavigationControllerImpl* controller = &web_contents->GetController(); | 269 NavigationControllerImpl* controller = &web_contents->GetController(); |
| 270 | 270 |
| 271 screenshot_manager_ = new ScreenshotTracker(controller); | 271 screenshot_manager_ = new ScreenshotTracker(controller); |
| 272 controller->SetScreenshotManager(make_scoped_ptr(screenshot_manager_)); | 272 controller->SetScreenshotManager(make_scoped_ptr(screenshot_manager_)); |
| 273 | 273 |
| 274 frame_watcher_ = new FrameWatcher(); | 274 frame_watcher_ = new FrameWatcher(); |
| 275 GetRenderWidgetHost()->GetProcess()->AddFilter(frame_watcher_.get()); | 275 frame_watcher_->AttachTo(shell()->web_contents()); |
| 276 } | 276 } |
| 277 | 277 |
| 278 void SetUpCommandLine(base::CommandLine* cmd) override { | 278 void SetUpCommandLine(base::CommandLine* cmd) override { |
| 279 cmd->AppendSwitchASCII(switches::kTouchEvents, | 279 cmd->AppendSwitchASCII(switches::kTouchEvents, |
| 280 switches::kTouchEventsEnabled); | 280 switches::kTouchEventsEnabled); |
| 281 } | 281 } |
| 282 | 282 |
| 283 void TestOverscrollNavigation(bool touch_handler) { | 283 void TestOverscrollNavigation(bool touch_handler) { |
| 284 ASSERT_NO_FATAL_FAILURE(StartTestWithPage("/overscroll_navigation.html")); | 284 ASSERT_NO_FATAL_FAILURE(StartTestWithPage("/overscroll_navigation.html")); |
| 285 WebContentsImpl* web_contents = | 285 WebContentsImpl* web_contents = |
| (...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1126 details = dispatcher->OnEventFromSource(&release); | 1126 details = dispatcher->OnEventFromSource(&release); |
| 1127 ASSERT_FALSE(details.dispatcher_destroyed); | 1127 ASSERT_FALSE(details.dispatcher_destroyed); |
| 1128 WaitAFrame(); | 1128 WaitAFrame(); |
| 1129 | 1129 |
| 1130 EXPECT_LT(0, tracker.num_overscroll_updates()); | 1130 EXPECT_LT(0, tracker.num_overscroll_updates()); |
| 1131 EXPECT_FALSE(tracker.overscroll_completed()); | 1131 EXPECT_FALSE(tracker.overscroll_completed()); |
| 1132 } | 1132 } |
| 1133 } | 1133 } |
| 1134 | 1134 |
| 1135 } // namespace content | 1135 } // namespace content |
| OLD | NEW |