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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 2047683002: Store Origin Trials public key in browser prefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase against https://codereview.chromium.org/2049783002 Created 4 years, 6 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
« no previous file with comments | « chrome/common/pref_names.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 // instantiate a RenderThreadImpl. 828 // instantiate a RenderThreadImpl.
829 if (MojoShellConnection::Get() && 829 if (MojoShellConnection::Get() &&
830 base::CommandLine::ForCurrentProcess()->HasSwitch( 830 base::CommandLine::ForCurrentProcess()->HasSwitch(
831 switches::kUseMusInRenderer)) 831 switches::kUseMusInRenderer))
832 CreateRenderWidgetWindowTreeClientFactory(); 832 CreateRenderWidgetWindowTreeClientFactory();
833 #endif 833 #endif
834 834
835 service_registry()->ConnectToRemoteService( 835 service_registry()->ConnectToRemoteService(
836 mojo::GetProxy(&storage_partition_service_)); 836 mojo::GetProxy(&storage_partition_service_));
837 837
838 GetContentClient()->InitializeOriginTrialPolicy();
839
838 is_renderer_suspended_ = false; 840 is_renderer_suspended_ = false;
839 } 841 }
840 842
841 RenderThreadImpl::~RenderThreadImpl() { 843 RenderThreadImpl::~RenderThreadImpl() {
842 } 844 }
843 845
844 void RenderThreadImpl::Shutdown() { 846 void RenderThreadImpl::Shutdown() {
845 FOR_EACH_OBSERVER( 847 FOR_EACH_OBSERVER(
846 RenderThreadObserver, observers_, OnRenderProcessShutdown()); 848 RenderThreadObserver, observers_, OnRenderProcessShutdown());
847 849
(...skipping 1248 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) 2098 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical)
2097 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; 2099 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate;
2098 2100
2099 blink::mainThreadIsolate()->MemoryPressureNotification( 2101 blink::mainThreadIsolate()->MemoryPressureNotification(
2100 v8_memory_pressure_level); 2102 v8_memory_pressure_level);
2101 blink::MemoryPressureNotificationToWorkerThreadIsolates( 2103 blink::MemoryPressureNotificationToWorkerThreadIsolates(
2102 v8_memory_pressure_level); 2104 v8_memory_pressure_level);
2103 } 2105 }
2104 2106
2105 } // namespace content 2107 } // namespace content
OLDNEW
« no previous file with comments | « chrome/common/pref_names.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698