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

Side by Side Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 19678004: Move UserScript and Extension switches to top-level extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 5 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 "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h" 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/prerender/prerender_util.h" 27 #include "chrome/browser/prerender/prerender_util.h"
28 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/profiles/profile_io_data.h" 29 #include "chrome/browser/profiles/profile_io_data.h"
30 #include "chrome/browser/renderer_host/chrome_url_request_user_data.h" 30 #include "chrome/browser/renderer_host/chrome_url_request_user_data.h"
31 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h " 31 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h "
32 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 32 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
33 #include "chrome/browser/ui/auto_login_prompter.h" 33 #include "chrome/browser/ui/auto_login_prompter.h"
34 #include "chrome/browser/ui/login/login_prompt.h" 34 #include "chrome/browser/ui/login/login_prompt.h"
35 #include "chrome/browser/ui/sync/one_click_signin_helper.h" 35 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
36 #include "chrome/common/extensions/mime_types_handler.h" 36 #include "chrome/common/extensions/mime_types_handler.h"
37 #include "chrome/common/extensions/user_script.h"
38 #include "chrome/common/render_messages.h" 37 #include "chrome/common/render_messages.h"
39 #include "content/public/browser/browser_thread.h" 38 #include "content/public/browser/browser_thread.h"
40 #include "content/public/browser/notification_service.h" 39 #include "content/public/browser/notification_service.h"
41 #include "content/public/browser/render_view_host.h" 40 #include "content/public/browser/render_view_host.h"
42 #include "content/public/browser/resource_context.h" 41 #include "content/public/browser/resource_context.h"
43 #include "content/public/browser/resource_dispatcher_host.h" 42 #include "content/public/browser/resource_dispatcher_host.h"
44 #include "content/public/browser/resource_request_info.h" 43 #include "content/public/browser/resource_request_info.h"
45 #include "content/public/browser/stream_handle.h" 44 #include "content/public/browser/stream_handle.h"
46 #include "content/public/common/resource_response.h" 45 #include "content/public/common/resource_response.h"
47 #include "extensions/common/constants.h" 46 #include "extensions/common/constants.h"
47 #include "extensions/common/user_script.h"
48 #include "net/base/load_flags.h" 48 #include "net/base/load_flags.h"
49 #include "net/base/load_timing_info.h" 49 #include "net/base/load_timing_info.h"
50 #include "net/http/http_response_headers.h" 50 #include "net/http/http_response_headers.h"
51 #include "net/ssl/ssl_config_service.h" 51 #include "net/ssl/ssl_config_service.h"
52 #include "net/url_request/url_request.h" 52 #include "net/url_request/url_request.h"
53 53
54 #if defined(ENABLE_MANAGED_USERS) 54 #if defined(ENABLE_MANAGED_USERS)
55 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h" 55 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"
56 #endif 56 #endif
57 57
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) && 633 if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) &&
634 ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView( 634 ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView(
635 &child_id, &route_id) && 635 &child_id, &route_id) &&
636 prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id)) { 636 prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id)) {
637 ReportUnsupportedPrerenderScheme(redirect_url); 637 ReportUnsupportedPrerenderScheme(redirect_url);
638 prerender_tracker_->TryCancel( 638 prerender_tracker_->TryCancel(
639 child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME); 639 child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME);
640 request->Cancel(); 640 request->Cancel();
641 } 641 }
642 } 642 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698