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

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

Issue 1432033003: Delete the auto-launch trial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +line break Created 5 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 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.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 #include <set> 8 #include <set>
9 9
10 #include "apps/app_load_service.h" 10 #include "apps/app_load_service.h"
(...skipping 13 matching lines...) Expand all
24 #include "base/prefs/pref_registry_simple.h" 24 #include "base/prefs/pref_registry_simple.h"
25 #include "base/prefs/pref_service.h" 25 #include "base/prefs/pref_service.h"
26 #include "base/profiler/scoped_profile.h" 26 #include "base/profiler/scoped_profile.h"
27 #include "base/strings/string_number_conversions.h" 27 #include "base/strings/string_number_conversions.h"
28 #include "base/strings/string_split.h" 28 #include "base/strings/string_split.h"
29 #include "base/strings/string_tokenizer.h" 29 #include "base/strings/string_tokenizer.h"
30 #include "base/strings/utf_string_conversions.h" 30 #include "base/strings/utf_string_conversions.h"
31 #include "base/threading/thread_restrictions.h" 31 #include "base/threading/thread_restrictions.h"
32 #include "base/trace_event/trace_event.h" 32 #include "base/trace_event/trace_event.h"
33 #include "chrome/browser/app_mode/app_mode_utils.h" 33 #include "chrome/browser/app_mode/app_mode_utils.h"
34 #include "chrome/browser/auto_launch_trial.h"
35 #include "chrome/browser/browser_process.h" 34 #include "chrome/browser/browser_process.h"
36 #include "chrome/browser/chrome_notification_types.h" 35 #include "chrome/browser/chrome_notification_types.h"
37 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 36 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
38 #include "chrome/browser/extensions/startup_helper.h" 37 #include "chrome/browser/extensions/startup_helper.h"
39 #include "chrome/browser/extensions/unpacked_installer.h" 38 #include "chrome/browser/extensions/unpacked_installer.h"
40 #include "chrome/browser/first_run/first_run.h" 39 #include "chrome/browser/first_run/first_run.h"
41 #include "chrome/browser/net/predictor.h" 40 #include "chrome/browser/net/predictor.h"
42 #include "chrome/browser/prefs/incognito_mode_prefs.h" 41 #include "chrome/browser/prefs/incognito_mode_prefs.h"
43 #include "chrome/browser/prefs/session_startup_pref.h" 42 #include "chrome/browser/prefs/session_startup_pref.h"
44 #include "chrome/browser/profiles/profile.h" 43 #include "chrome/browser/profiles/profile.h"
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 // If we are showing the app list then chrome isn't shown so load the app 907 // If we are showing the app list then chrome isn't shown so load the app
909 // list's profile rather than chrome's. 908 // list's profile rather than chrome's.
910 if (command_line.HasSwitch(switches::kShowAppList)) { 909 if (command_line.HasSwitch(switches::kShowAppList)) {
911 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> 910 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
912 GetProfilePath(user_data_dir); 911 GetProfilePath(user_data_dir);
913 } 912 }
914 913
915 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 914 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
916 user_data_dir); 915 user_data_dir);
917 } 916 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/autolaunch_prompt_win.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698