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

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

Issue 2419063003: Move services/shell to services/service_manager (Closed)
Patch Set: 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_render_thread_observer.h" 5 #include "chrome/renderer/chrome_render_thread_observer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 #include <memory> 10 #include <memory>
(...skipping 28 matching lines...) Expand all
39 #include "chrome/renderer/security_filter_peer.h" 39 #include "chrome/renderer/security_filter_peer.h"
40 #include "components/visitedlink/renderer/visitedlink_slave.h" 40 #include "components/visitedlink/renderer/visitedlink_slave.h"
41 #include "content/public/child/resource_dispatcher_delegate.h" 41 #include "content/public/child/resource_dispatcher_delegate.h"
42 #include "content/public/renderer/render_thread.h" 42 #include "content/public/renderer/render_thread.h"
43 #include "content/public/renderer/render_view.h" 43 #include "content/public/renderer/render_view.h"
44 #include "content/public/renderer/render_view_visitor.h" 44 #include "content/public/renderer/render_view_visitor.h"
45 #include "media/base/media_resources.h" 45 #include "media/base/media_resources.h"
46 #include "mojo/public/cpp/bindings/strong_binding.h" 46 #include "mojo/public/cpp/bindings/strong_binding.h"
47 #include "net/base/net_errors.h" 47 #include "net/base/net_errors.h"
48 #include "net/base/net_module.h" 48 #include "net/base/net_module.h"
49 #include "services/shell/public/cpp/interface_registry.h" 49 #include "services/service_manager/public/cpp/interface_registry.h"
50 #include "third_party/WebKit/public/web/WebCache.h" 50 #include "third_party/WebKit/public/web/WebCache.h"
51 #include "third_party/WebKit/public/web/WebDocument.h" 51 #include "third_party/WebKit/public/web/WebDocument.h"
52 #include "third_party/WebKit/public/web/WebFrame.h" 52 #include "third_party/WebKit/public/web/WebFrame.h"
53 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" 53 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
54 #include "third_party/WebKit/public/web/WebView.h" 54 #include "third_party/WebKit/public/web/WebView.h"
55 55
56 #if defined(ENABLE_EXTENSIONS) 56 #if defined(ENABLE_EXTENSIONS)
57 #include "chrome/renderer/extensions/extension_localization_peer.h" 57 #include "chrome/renderer/extensions/extension_localization_peer.h"
58 #endif 58 #endif
59 59
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 void ChromeRenderThreadObserver::OnSetFieldTrialGroup( 309 void ChromeRenderThreadObserver::OnSetFieldTrialGroup(
310 const std::string& trial_name, 310 const std::string& trial_name,
311 const std::string& group_name) { 311 const std::string& group_name) {
312 field_trial_syncer_.OnSetFieldTrialGroup(trial_name, group_name); 312 field_trial_syncer_.OnSetFieldTrialGroup(trial_name, group_name);
313 } 313 }
314 314
315 const RendererContentSettingRules* 315 const RendererContentSettingRules*
316 ChromeRenderThreadObserver::content_setting_rules() const { 316 ChromeRenderThreadObserver::content_setting_rules() const {
317 return &content_setting_rules_; 317 return &content_setting_rules_;
318 } 318 }
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_render_frame_observer_browsertest.cc ('k') | chrome/renderer/leak_detector/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698