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

Side by Side Diff: chrome/browser/profile_resetter/automatic_profile_resetter.cc

Issue 368273011: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
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/profile_resetter/automatic_profile_resetter.h" 5 #include "chrome/browser/profile_resetter/automatic_profile_resetter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/metrics/sparse_histogram.h" 13 #include "base/metrics/sparse_histogram.h"
14 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/task_runner.h" 17 #include "base/task_runner.h"
18 #include "base/task_runner_util.h" 18 #include "base/task_runner_util.h"
19 #include "base/threading/sequenced_worker_pool.h" 19 #include "base/threading/sequenced_worker_pool.h"
20 #include "base/time/time.h" 20 #include "base/time/time.h"
21 #include "base/timer/elapsed_timer.h" 21 #include "base/timer/elapsed_timer.h"
22 #include "base/values.h" 22 #include "base/values.h"
23 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h" 24 #include "chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h"
25 #include "chrome/browser/profile_resetter/jtl_interpreter.h" 25 #include "chrome/browser/profile_resetter/jtl_interpreter.h"
26 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
27 #include "chrome/browser/search_engines/template_url_service.h"
27 #include "chrome/browser/search_engines/template_url_service_factory.h" 28 #include "chrome/browser/search_engines/template_url_service_factory.h"
28 #include "components/search_engines/template_url_service.h"
29 #include "components/variations/variations_associated_data.h" 29 #include "components/variations/variations_associated_data.h"
30 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
31 #include "grit/browser_resources.h" 31 #include "grit/browser_resources.h"
32 #include "ui/base/resource/resource_bundle.h" 32 #include "ui/base/resource/resource_bundle.h"
33 33
34 34
35 // Helpers ------------------------------------------------------------------- 35 // Helpers -------------------------------------------------------------------
36 36
37 namespace { 37 namespace {
38 38
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 755
756 void AutomaticProfileResetter::FinishResetPromptFlow() { 756 void AutomaticProfileResetter::FinishResetPromptFlow() {
757 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 757 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
758 DCHECK(state_ == STATE_HAS_TRIGGERED_PROMPT || 758 DCHECK(state_ == STATE_HAS_TRIGGERED_PROMPT ||
759 state_ == STATE_HAS_SHOWN_BUBBLE || 759 state_ == STATE_HAS_SHOWN_BUBBLE ||
760 state_ == STATE_PERFORMING_RESET); 760 state_ == STATE_PERFORMING_RESET);
761 DCHECK(!evaluation_results_); 761 DCHECK(!evaluation_results_);
762 762
763 state_ = STATE_DONE; 763 state_ = STATE_DONE;
764 } 764 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698