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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
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/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 #include "content/public/renderer/plugin_instance_throttler.h" 91 #include "content/public/renderer/plugin_instance_throttler.h"
92 #include "content/public/renderer/render_frame.h" 92 #include "content/public/renderer/render_frame.h"
93 #include "content/public/renderer/render_thread.h" 93 #include "content/public/renderer/render_thread.h"
94 #include "content/public/renderer/render_view.h" 94 #include "content/public/renderer/render_view.h"
95 #include "content/public/renderer/render_view_visitor.h" 95 #include "content/public/renderer/render_view_visitor.h"
96 #include "extensions/common/constants.h" 96 #include "extensions/common/constants.h"
97 #include "ipc/ipc_sync_channel.h" 97 #include "ipc/ipc_sync_channel.h"
98 #include "net/base/net_errors.h" 98 #include "net/base/net_errors.h"
99 #include "ppapi/c/private/ppb_pdf.h" 99 #include "ppapi/c/private/ppb_pdf.h"
100 #include "ppapi/shared_impl/ppapi_switches.h" 100 #include "ppapi/shared_impl/ppapi_switches.h"
101 #include "services/shell/public/cpp/interface_provider.h" 101 #include "services/service_manager/public/cpp/interface_provider.h"
102 #include "third_party/WebKit/public/platform/URLConversion.h" 102 #include "third_party/WebKit/public/platform/URLConversion.h"
103 #include "third_party/WebKit/public/platform/WebCachePolicy.h" 103 #include "third_party/WebKit/public/platform/WebCachePolicy.h"
104 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 104 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
105 #include "third_party/WebKit/public/platform/WebURL.h" 105 #include "third_party/WebKit/public/platform/WebURL.h"
106 #include "third_party/WebKit/public/platform/WebURLError.h" 106 #include "third_party/WebKit/public/platform/WebURLError.h"
107 #include "third_party/WebKit/public/platform/WebURLRequest.h" 107 #include "third_party/WebKit/public/platform/WebURLRequest.h"
108 #include "third_party/WebKit/public/platform/WebURLResponse.h" 108 #include "third_party/WebKit/public/platform/WebURLResponse.h"
109 #include "third_party/WebKit/public/web/WebCache.h" 109 #include "third_party/WebKit/public/web/WebCache.h"
110 #include "third_party/WebKit/public/web/WebDataSource.h" 110 #include "third_party/WebKit/public/web/WebDataSource.h"
111 #include "third_party/WebKit/public/web/WebDocument.h" 111 #include "third_party/WebKit/public/web/WebDocument.h"
(...skipping 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 1483
1484 url::Replacements<char> r; 1484 url::Replacements<char> r;
1485 r.SetPath(path.c_str(), url::Component(0, path.length())); 1485 r.SetPath(path.c_str(), url::Component(0, path.length()));
1486 1486
1487 if (result == internal::NUM_PLUGIN_ERROR) 1487 if (result == internal::NUM_PLUGIN_ERROR)
1488 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; 1488 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS;
1489 1489
1490 RecordYouTubeRewriteUMA(result); 1490 RecordYouTubeRewriteUMA(result);
1491 return corrected_url.ReplaceComponents(r); 1491 return corrected_url.ReplaceComponents(r);
1492 } 1492 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698