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

Side by Side Diff: components/dom_distiller/content/browser/dom_distiller_viewer_source.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/dom_distiller/content/browser/dom_distiller_viewer_source.h " 5 #include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h "
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 23 matching lines...) Expand all
34 #include "content/public/browser/navigation_entry.h" 34 #include "content/public/browser/navigation_entry.h"
35 #include "content/public/browser/navigation_handle.h" 35 #include "content/public/browser/navigation_handle.h"
36 #include "content/public/browser/render_frame_host.h" 36 #include "content/public/browser/render_frame_host.h"
37 #include "content/public/browser/render_view_host.h" 37 #include "content/public/browser/render_view_host.h"
38 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
39 #include "content/public/browser/web_contents_observer.h" 39 #include "content/public/browser/web_contents_observer.h"
40 #include "grit/components_strings.h" 40 #include "grit/components_strings.h"
41 #include "mojo/public/cpp/bindings/strong_binding.h" 41 #include "mojo/public/cpp/bindings/strong_binding.h"
42 #include "net/base/url_util.h" 42 #include "net/base/url_util.h"
43 #include "net/url_request/url_request.h" 43 #include "net/url_request/url_request.h"
44 #include "services/shell/public/cpp/interface_provider.h" 44 #include "services/service_manager/public/cpp/interface_provider.h"
45 #include "services/shell/public/cpp/interface_registry.h" 45 #include "services/service_manager/public/cpp/interface_registry.h"
46 #include "ui/base/l10n/l10n_util.h" 46 #include "ui/base/l10n/l10n_util.h"
47 47
48 namespace dom_distiller { 48 namespace dom_distiller {
49 49
50 // Handles receiving data asynchronously for a specific entry, and passing 50 // Handles receiving data asynchronously for a specific entry, and passing
51 // it along to the data callback for the data source. Lifetime matches that of 51 // it along to the data callback for the data source. Lifetime matches that of
52 // the current main frame's page in the Viewer instance. 52 // the current main frame's page in the Viewer instance.
53 class DomDistillerViewerSource::RequestViewerHandle 53 class DomDistillerViewerSource::RequestViewerHandle
54 : public DomDistillerRequestViewBase, 54 : public DomDistillerRequestViewBase,
55 public content::WebContentsObserver { 55 public content::WebContentsObserver {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() 306 std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
307 const { 307 const {
308 return "style-src 'self' https://fonts.googleapis.com;"; 308 return "style-src 'self' https://fonts.googleapis.com;";
309 } 309 }
310 310
311 std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const { 311 std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const {
312 return "child-src *;"; 312 return "child-src *;";
313 } 313 }
314 314
315 } // namespace dom_distiller 315 } // namespace dom_distiller
OLDNEW
« no previous file with comments | « components/dom_distiller/content/browser/distillability_driver.cc ('k') | components/dom_distiller/content/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698