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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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_process_observer.h" 5 #include "chrome/renderer/chrome_render_process_observer.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/allocator/allocator_extension.h" 10 #include "base/allocator/allocator_extension.h"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/common/resource_usage_reporter_type_converters.h" 30 #include "chrome/common/resource_usage_reporter_type_converters.h"
31 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
32 #include "chrome/renderer/content_settings_observer.h" 32 #include "chrome/renderer/content_settings_observer.h"
33 #include "chrome/renderer/security_filter_peer.h" 33 #include "chrome/renderer/security_filter_peer.h"
34 #include "components/variations/variations_util.h" 34 #include "components/variations/variations_util.h"
35 #include "content/public/child/resource_dispatcher_delegate.h" 35 #include "content/public/child/resource_dispatcher_delegate.h"
36 #include "content/public/common/service_registry.h" 36 #include "content/public/common/service_registry.h"
37 #include "content/public/renderer/render_thread.h" 37 #include "content/public/renderer/render_thread.h"
38 #include "content/public/renderer/render_view.h" 38 #include "content/public/renderer/render_view.h"
39 #include "content/public/renderer/render_view_visitor.h" 39 #include "content/public/renderer/render_view_visitor.h"
40 #include "mojo/public/cpp/bindings/strong_binding.h"
40 #include "net/base/net_errors.h" 41 #include "net/base/net_errors.h"
41 #include "net/base/net_module.h" 42 #include "net/base/net_module.h"
42 #include "third_party/WebKit/public/web/WebCache.h" 43 #include "third_party/WebKit/public/web/WebCache.h"
43 #include "third_party/WebKit/public/web/WebDocument.h" 44 #include "third_party/WebKit/public/web/WebDocument.h"
44 #include "third_party/WebKit/public/web/WebFrame.h" 45 #include "third_party/WebKit/public/web/WebFrame.h"
45 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 46 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
46 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" 47 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
47 #include "third_party/WebKit/public/web/WebView.h" 48 #include "third_party/WebKit/public/web/WebView.h"
48 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
49 49
50 #if defined(ENABLE_EXTENSIONS) 50 #if defined(ENABLE_EXTENSIONS)
51 #include "chrome/renderer/extensions/extension_localization_peer.h" 51 #include "chrome/renderer/extensions/extension_localization_peer.h"
52 #endif 52 #endif
53 53
54 #if !defined(OS_IOS) 54 #if !defined(OS_IOS)
55 #include "chrome/common/media/media_resource_provider.h" 55 #include "chrome/common/media/media_resource_provider.h"
56 #include "media/base/media_resources.h" 56 #include "media/base/media_resources.h"
57 #endif 57 #endif
58 58
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 ChromeRenderProcessObserver::content_setting_rules() const { 330 ChromeRenderProcessObserver::content_setting_rules() const {
331 return &content_setting_rules_; 331 return &content_setting_rules_;
332 } 332 }
333 333
334 void ChromeRenderProcessObserver::OnFieldTrialGroupFinalized( 334 void ChromeRenderProcessObserver::OnFieldTrialGroupFinalized(
335 const std::string& trial_name, 335 const std::string& trial_name,
336 const std::string& group_name) { 336 const std::string& group_name) {
337 content::RenderThread::Get()->Send( 337 content::RenderThread::Get()->Send(
338 new ChromeViewHostMsg_FieldTrialActivated(trial_name)); 338 new ChromeViewHostMsg_FieldTrialActivated(trial_name));
339 } 339 }
OLDNEW
« no previous file with comments | « chrome/common/resource_usage_reporter_type_converters.h ('k') | chrome/utility/chrome_content_utility_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698