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

Side by Side Diff: chrome/browser/chrome_browser_field_trials_desktop.cc

Issue 998513002: Revert of Remove OneClickSigninHelper since it is no longer used. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ocl
Patch Set: Created 5 years, 9 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 | « no previous file | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/chrome_browser_field_trials_desktop.h" 5 #include "chrome/browser/chrome_browser_field_trials_desktop.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "chrome/browser/auto_launch_trial.h" 13 #include "chrome/browser/auto_launch_trial.h"
14 #include "chrome/browser/google/google_brand.h" 14 #include "chrome/browser/google/google_brand.h"
15 #include "chrome/browser/prerender/prerender_field_trial.h" 15 #include "chrome/browser/prerender/prerender_field_trial.h"
16 #include "chrome/browser/profiles/profiles_state.h" 16 #include "chrome/browser/profiles/profiles_state.h"
17 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" 17 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
18 #include "chrome/browser/ui/app_list/app_list_util.h" 18 #include "chrome/browser/ui/app_list/app_list_util.h"
19 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
19 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/chrome_version_info.h" 21 #include "chrome/common/chrome_version_info.h"
21 #include "chrome/common/variations/variations_util.h" 22 #include "chrome/common/variations/variations_util.h"
22 #include "content/public/common/content_constants.h" 23 #include "content/public/common/content_constants.h"
23 #include "net/spdy/spdy_session.h" 24 #include "net/spdy/spdy_session.h"
24 #include "ui/base/layout.h" 25 #include "ui/base/layout.h"
25 26
26 namespace chrome { 27 namespace chrome {
27 28
28 namespace { 29 namespace {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void SetupDesktopFieldTrials(const base::CommandLine& parsed_command_line, 68 void SetupDesktopFieldTrials(const base::CommandLine& parsed_command_line,
68 PrefService* local_state) { 69 PrefService* local_state) {
69 prerender::ConfigurePrerender(parsed_command_line); 70 prerender::ConfigurePrerender(parsed_command_line);
70 AutoLaunchChromeFieldTrial(); 71 AutoLaunchChromeFieldTrial();
71 SetupInfiniteCacheFieldTrial(); 72 SetupInfiniteCacheFieldTrial();
72 DisableShowProfileSwitcherTrialIfNecessary(); 73 DisableShowProfileSwitcherTrialIfNecessary();
73 SetupShowAppLauncherPromoFieldTrial(local_state); 74 SetupShowAppLauncherPromoFieldTrial(local_state);
74 } 75 }
75 76
76 } // namespace chrome 77 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698