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

Unified Diff: chrome/renderer/chrome_render_thread_observer.h

Issue 2514593002: Field trial synchronization to PPAPI process. (Closed)
Patch Set: Fix namespace. Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/gpu/chrome_content_gpu_client.cc ('k') | chrome/renderer/chrome_render_thread_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_render_thread_observer.h
diff --git a/chrome/renderer/chrome_render_thread_observer.h b/chrome/renderer/chrome_render_thread_observer.h
index 3e377bb4f905ffd8807bac38c7f11188a37179b0..06a1daadcd1daeac34d4cfd600495fa7931b7980 100644
--- a/chrome/renderer/chrome_render_thread_observer.h
+++ b/chrome/renderer/chrome_render_thread_observer.h
@@ -12,17 +12,13 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/metrics/field_trial.h"
-#include "chrome/common/variations/child_process_field_trial_syncer.h"
#include "components/content_settings/core/common/content_settings.h"
+#include "components/variations/child_process_field_trial_syncer.h"
#include "content/public/renderer/render_thread_observer.h"
class GURL;
struct ContentSettings;
-namespace base {
-class CommandLine;
-}
-
namespace content {
class ResourceDispatcherDelegate;
}
@@ -52,10 +48,6 @@ class ChromeRenderThreadObserver : public content::RenderThreadObserver,
}
private:
- // Initializes field trial state change observation and notifies the browser
- // of any field trials that might have already been activated.
- void InitFieldTrialObserving(const base::CommandLine& command_line);
-
// content::RenderThreadObserver:
bool OnControlMessageReceived(const IPC::Message& message) override;
void OnRenderProcessShutdown() override;
@@ -75,7 +67,7 @@ class ChromeRenderThreadObserver : public content::RenderThreadObserver,
static bool is_incognito_process_;
std::unique_ptr<content::ResourceDispatcherDelegate> resource_delegate_;
RendererContentSettingRules content_setting_rules_;
- chrome_variations::ChildProcessFieldTrialSyncer field_trial_syncer_;
+ variations::ChildProcessFieldTrialSyncer field_trial_syncer_;
std::unique_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
« no previous file with comments | « chrome/gpu/chrome_content_gpu_client.cc ('k') | chrome/renderer/chrome_render_thread_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698