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

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

Issue 436703002: Revert external protocol handler user gesture fix on M36 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985/src
Patch Set: 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 969 matching lines...) Expand 10 before | Expand all | Expand 10 after
980 // ExternalProtocolHandler::Delegate implementation. 980 // ExternalProtocolHandler::Delegate implementation.
981 virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker( 981 virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
982 ShellIntegration::DefaultWebClientObserver* observer, 982 ShellIntegration::DefaultWebClientObserver* observer,
983 const std::string& protocol) OVERRIDE { 983 const std::string& protocol) OVERRIDE {
984 NOTREACHED(); 984 NOTREACHED();
985 // This will crash, but it shouldn't get this far with BlockState::BLOCK 985 // This will crash, but it shouldn't get this far with BlockState::BLOCK
986 // anyway. 986 // anyway.
987 return NULL; 987 return NULL;
988 } 988 }
989 virtual ExternalProtocolHandler::BlockState GetBlockState( 989 virtual ExternalProtocolHandler::BlockState GetBlockState(
990 const std::string& scheme, 990 const std::string& scheme) OVERRIDE {
991 bool initiated_by_user_gesture) OVERRIDE {
992 // Block everything and fail the test. 991 // Block everything and fail the test.
993 ADD_FAILURE(); 992 ADD_FAILURE();
994 return ExternalProtocolHandler::BLOCK; 993 return ExternalProtocolHandler::BLOCK;
995 } 994 }
996 virtual void BlockRequest() OVERRIDE { } 995 virtual void BlockRequest() OVERRIDE { }
997 virtual void RunExternalProtocolDialog(const GURL& url, 996 virtual void RunExternalProtocolDialog(const GURL& url,
998 int render_process_host_id, 997 int render_process_host_id,
999 int routing_id) OVERRIDE { 998 int routing_id) OVERRIDE {
1000 NOTREACHED(); 999 NOTREACHED();
1001 } 1000 }
(...skipping 3260 matching lines...) Expand 10 before | Expand all | Expand 10 after
4262 4261
4263 // Navigate to the URL entered. 4262 // Navigate to the URL entered.
4264 omnibox_view->model()->AcceptInput(CURRENT_TAB, false); 4263 omnibox_view->model()->AcceptInput(CURRENT_TAB, false);
4265 4264
4266 // Prerender should be running, but abandoned. 4265 // Prerender should be running, but abandoned.
4267 EXPECT_TRUE( 4266 EXPECT_TRUE(
4268 GetAutocompleteActionPredictor()->IsPrerenderAbandonedForTesting()); 4267 GetAutocompleteActionPredictor()->IsPrerenderAbandonedForTesting());
4269 } 4268 }
4270 4269
4271 } // namespace prerender 4270 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698