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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 2510803003: Pass RapporService to content/browser/ (Closed)
Patch Set: Fix more compile errors in JNI files Created 4 years 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 "chrome/browser/ui/startup/startup_browser_creator_impl.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 #include "chrome/common/chrome_result_codes.h" 81 #include "chrome/common/chrome_result_codes.h"
82 #include "chrome/common/chrome_switches.h" 82 #include "chrome/common/chrome_switches.h"
83 #include "chrome/common/extensions/extension_constants.h" 83 #include "chrome/common/extensions/extension_constants.h"
84 #include "chrome/common/extensions/extension_metrics.h" 84 #include "chrome/common/extensions/extension_metrics.h"
85 #include "chrome/common/pref_names.h" 85 #include "chrome/common/pref_names.h"
86 #include "chrome/common/url_constants.h" 86 #include "chrome/common/url_constants.h"
87 #include "chrome/grit/locale_settings.h" 87 #include "chrome/grit/locale_settings.h"
88 #include "chrome/installer/util/browser_distribution.h" 88 #include "chrome/installer/util/browser_distribution.h"
89 #include "components/google/core/browser/google_util.h" 89 #include "components/google/core/browser/google_util.h"
90 #include "components/prefs/pref_service.h" 90 #include "components/prefs/pref_service.h"
91 #include "components/rappor/rappor_utils.h" 91 #include "components/rappor/public/rappor_utils.h"
92 #include "components/rappor/rappor_service_impl.h"
92 #include "content/public/browser/child_process_security_policy.h" 93 #include "content/public/browser/child_process_security_policy.h"
93 #include "content/public/browser/dom_storage_context.h" 94 #include "content/public/browser/dom_storage_context.h"
94 #include "content/public/browser/notification_observer.h" 95 #include "content/public/browser/notification_observer.h"
95 #include "content/public/browser/notification_registrar.h" 96 #include "content/public/browser/notification_registrar.h"
96 #include "content/public/browser/storage_partition.h" 97 #include "content/public/browser/storage_partition.h"
97 #include "content/public/browser/web_contents.h" 98 #include "content/public/browser/web_contents.h"
98 #include "content/public/common/content_switches.h" 99 #include "content/public/common/content_switches.h"
99 #include "extensions/browser/extension_prefs.h" 100 #include "extensions/browser/extension_prefs.h"
100 #include "extensions/browser/extension_registry.h" 101 #include "extensions/browser/extension_registry.h"
101 #include "extensions/common/constants.h" 102 #include "extensions/common/constants.h"
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 #if defined(OS_WIN) 1222 #if defined(OS_WIN)
1222 TriggeredProfileResetter* triggered_profile_resetter = 1223 TriggeredProfileResetter* triggered_profile_resetter =
1223 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); 1224 TriggeredProfileResetterFactory::GetForBrowserContext(profile_);
1224 // TriggeredProfileResetter instance will be nullptr for incognito profiles. 1225 // TriggeredProfileResetter instance will be nullptr for incognito profiles.
1225 if (triggered_profile_resetter) { 1226 if (triggered_profile_resetter) {
1226 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); 1227 has_reset_trigger = triggered_profile_resetter->HasResetTrigger();
1227 } 1228 }
1228 #endif // defined(OS_WIN) 1229 #endif // defined(OS_WIN)
1229 return has_reset_trigger; 1230 return has_reset_trigger;
1230 } 1231 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698