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

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: 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
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 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 // instantiate a RenderThreadImpl. 814 // instantiate a RenderThreadImpl.
815 if (MojoShellConnection::Get() && 815 if (MojoShellConnection::Get() &&
816 base::CommandLine::ForCurrentProcess()->HasSwitch( 816 base::CommandLine::ForCurrentProcess()->HasSwitch(
817 switches::kUseMusInRenderer)) 817 switches::kUseMusInRenderer))
818 CreateRenderWidgetWindowTreeClientFactory(); 818 CreateRenderWidgetWindowTreeClientFactory();
819 #endif 819 #endif
820 820
821 service_registry()->ConnectToRemoteService( 821 service_registry()->ConnectToRemoteService(
822 mojo::GetProxy(&storage_partition_service_)); 822 mojo::GetProxy(&storage_partition_service_));
823 823
824 GetContentClient()->InitializeOriginTrialPolicy();
825
824 is_renderer_suspended_ = false; 826 is_renderer_suspended_ = false;
825 } 827 }
826 828
827 RenderThreadImpl::~RenderThreadImpl() { 829 RenderThreadImpl::~RenderThreadImpl() {
828 } 830 }
829 831
830 void RenderThreadImpl::Shutdown() { 832 void RenderThreadImpl::Shutdown() {
831 FOR_EACH_OBSERVER( 833 FOR_EACH_OBSERVER(
832 RenderThreadObserver, observers_, OnRenderProcessShutdown()); 834 RenderThreadObserver, observers_, OnRenderProcessShutdown());
833 835
(...skipping 1248 matching lines...) Expand 10 before | Expand all | Expand 10 after
2082 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) 2084 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical)
2083 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; 2085 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate;
2084 2086
2085 blink::mainThreadIsolate()->MemoryPressureNotification( 2087 blink::mainThreadIsolate()->MemoryPressureNotification(
2086 v8_memory_pressure_level); 2088 v8_memory_pressure_level);
2087 blink::MemoryPressureNotificationToWorkerThreadIsolates( 2089 blink::MemoryPressureNotificationToWorkerThreadIsolates(
2088 v8_memory_pressure_level); 2090 v8_memory_pressure_level);
2089 } 2091 }
2090 2092
2091 } // namespace content 2093 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698