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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 "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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "apps/app_restore_service.h" 13 #include "apps/app_restore_service.h"
14 #include "apps/app_restore_service_factory.h" 14 #include "apps/app_restore_service_factory.h"
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/bind_helpers.h" 16 #include "base/bind_helpers.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/compiler_specific.h" 18 #include "base/compiler_specific.h"
19 #include "base/environment.h" 19 #include "base/environment.h"
20 #include "base/lazy_instance.h" 20 #include "base/lazy_instance.h"
21 #include "base/memory/scoped_ptr.h" 21 #include "base/memory/scoped_ptr.h"
22 #include "base/metrics/histogram_macros.h" 22 #include "base/metrics/histogram_macros.h"
23 #include "base/metrics/statistics_recorder.h" 23 #include "base/metrics/statistics_recorder.h"
24 #include "base/prefs/pref_service.h"
25 #include "base/strings/string_number_conversions.h" 24 #include "base/strings/string_number_conversions.h"
26 #include "base/strings/string_split.h" 25 #include "base/strings/string_split.h"
27 #include "base/strings/string_util.h" 26 #include "base/strings/string_util.h"
28 #include "base/strings/stringprintf.h" 27 #include "base/strings/stringprintf.h"
29 #include "base/strings/utf_string_conversions.h" 28 #include "base/strings/utf_string_conversions.h"
30 #include "base/threading/thread_restrictions.h" 29 #include "base/threading/thread_restrictions.h"
31 #include "build/build_config.h" 30 #include "build/build_config.h"
32 #include "chrome/browser/apps/install_chrome_app.h" 31 #include "chrome/browser/apps/install_chrome_app.h"
33 #include "chrome/browser/browser_process.h" 32 #include "chrome/browser/browser_process.h"
34 #include "chrome/browser/chrome_notification_types.h" 33 #include "chrome/browser/chrome_notification_types.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "chrome/common/chrome_paths.h" 77 #include "chrome/common/chrome_paths.h"
79 #include "chrome/common/chrome_result_codes.h" 78 #include "chrome/common/chrome_result_codes.h"
80 #include "chrome/common/chrome_switches.h" 79 #include "chrome/common/chrome_switches.h"
81 #include "chrome/common/extensions/extension_constants.h" 80 #include "chrome/common/extensions/extension_constants.h"
82 #include "chrome/common/extensions/extension_metrics.h" 81 #include "chrome/common/extensions/extension_metrics.h"
83 #include "chrome/common/pref_names.h" 82 #include "chrome/common/pref_names.h"
84 #include "chrome/common/url_constants.h" 83 #include "chrome/common/url_constants.h"
85 #include "chrome/grit/locale_settings.h" 84 #include "chrome/grit/locale_settings.h"
86 #include "chrome/installer/util/browser_distribution.h" 85 #include "chrome/installer/util/browser_distribution.h"
87 #include "components/google/core/browser/google_util.h" 86 #include "components/google/core/browser/google_util.h"
87 #include "components/prefs/pref_service.h"
88 #include "components/rappor/rappor_utils.h" 88 #include "components/rappor/rappor_utils.h"
89 #include "content/public/browser/child_process_security_policy.h" 89 #include "content/public/browser/child_process_security_policy.h"
90 #include "content/public/browser/dom_storage_context.h" 90 #include "content/public/browser/dom_storage_context.h"
91 #include "content/public/browser/notification_observer.h" 91 #include "content/public/browser/notification_observer.h"
92 #include "content/public/browser/notification_registrar.h" 92 #include "content/public/browser/notification_registrar.h"
93 #include "content/public/browser/storage_partition.h" 93 #include "content/public/browser/storage_partition.h"
94 #include "content/public/browser/web_contents.h" 94 #include "content/public/browser/web_contents.h"
95 #include "content/public/common/content_switches.h" 95 #include "content/public/common/content_switches.h"
96 #include "extensions/browser/extension_prefs.h" 96 #include "extensions/browser/extension_prefs.h"
97 #include "extensions/browser/extension_registry.h" 97 #include "extensions/browser/extension_registry.h"
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 #if defined(OS_WIN) 999 #if defined(OS_WIN)
1000 TriggeredProfileResetter* triggered_profile_resetter = 1000 TriggeredProfileResetter* triggered_profile_resetter =
1001 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); 1001 TriggeredProfileResetterFactory::GetForBrowserContext(profile_);
1002 // TriggeredProfileResetter instance will be nullptr for incognito profiles. 1002 // TriggeredProfileResetter instance will be nullptr for incognito profiles.
1003 if (triggered_profile_resetter) { 1003 if (triggered_profile_resetter) {
1004 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); 1004 has_reset_trigger = triggered_profile_resetter->HasResetTrigger();
1005 } 1005 }
1006 #endif // defined(OS_WIN) 1006 #endif // defined(OS_WIN)
1007 return has_reset_trigger; 1007 return has_reset_trigger;
1008 } 1008 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698