Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 426713002: Revert of Fix the handling of user gestures for external protocol handler dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <deque> 5 #include <deque>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 // ExternalProtocolHandler::Delegate implementation. 977 // ExternalProtocolHandler::Delegate implementation.
978 virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker( 978 virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
979 ShellIntegration::DefaultWebClientObserver* observer, 979 ShellIntegration::DefaultWebClientObserver* observer,
980 const std::string& protocol) OVERRIDE { 980 const std::string& protocol) OVERRIDE {
981 NOTREACHED(); 981 NOTREACHED();
982 // This will crash, but it shouldn't get this far with BlockState::BLOCK 982 // This will crash, but it shouldn't get this far with BlockState::BLOCK
983 // anyway. 983 // anyway.
984 return NULL; 984 return NULL;
985 } 985 }
986 virtual ExternalProtocolHandler::BlockState GetBlockState( 986 virtual ExternalProtocolHandler::BlockState GetBlockState(
987 const std::string& scheme, 987 const std::string& scheme) OVERRIDE {
988 bool initiated_by_user_gesture) OVERRIDE {
989 // Block everything and fail the test. 988 // Block everything and fail the test.
990 ADD_FAILURE(); 989 ADD_FAILURE();
991 return ExternalProtocolHandler::BLOCK; 990 return ExternalProtocolHandler::BLOCK;
992 } 991 }
993 virtual void BlockRequest() OVERRIDE { } 992 virtual void BlockRequest() OVERRIDE { }
994 virtual void RunExternalProtocolDialog(const GURL& url, 993 virtual void RunExternalProtocolDialog(const GURL& url,
995 int render_process_host_id, 994 int render_process_host_id,
996 int routing_id) OVERRIDE { 995 int routing_id) OVERRIDE {
997 NOTREACHED(); 996 NOTREACHED();
998 } 997 }
(...skipping 3421 matching lines...) Expand 10 before | Expand all | Expand 10 after
4420 4419
4421 // Navigate to the URL entered. 4420 // Navigate to the URL entered.
4422 omnibox_view->model()->AcceptInput(CURRENT_TAB, false); 4421 omnibox_view->model()->AcceptInput(CURRENT_TAB, false);
4423 4422
4424 // Prerender should be running, but abandoned. 4423 // Prerender should be running, but abandoned.
4425 EXPECT_TRUE( 4424 EXPECT_TRUE(
4426 GetAutocompleteActionPredictor()->IsPrerenderAbandonedForTesting()); 4425 GetAutocompleteActionPredictor()->IsPrerenderAbandonedForTesting());
4427 } 4426 }
4428 4427
4429 } // namespace prerender 4428 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698