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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> // For max(). 9 #include <algorithm> // For max().
10 #include <memory>
10 #include <set> 11 #include <set>
11 12
12 #include "apps/app_load_service.h" 13 #include "apps/app_load_service.h"
13 #include "apps/switches.h" 14 #include "apps/switches.h"
14 #include "base/bind.h" 15 #include "base/bind.h"
15 #include "base/bind_helpers.h" 16 #include "base/bind_helpers.h"
16 #include "base/command_line.h" 17 #include "base/command_line.h"
17 #include "base/compiler_specific.h" 18 #include "base/compiler_specific.h"
18 #include "base/environment.h" 19 #include "base/environment.h"
19 #include "base/files/file_path.h" 20 #include "base/files/file_path.h"
20 #include "base/files/file_util.h" 21 #include "base/files/file_util.h"
21 #include "base/lazy_instance.h" 22 #include "base/lazy_instance.h"
22 #include "base/logging.h" 23 #include "base/logging.h"
23 #include "base/macros.h" 24 #include "base/macros.h"
24 #include "base/memory/scoped_ptr.h"
25 #include "base/metrics/histogram_macros.h" 25 #include "base/metrics/histogram_macros.h"
26 #include "base/metrics/statistics_recorder.h" 26 #include "base/metrics/statistics_recorder.h"
27 #include "base/metrics/user_metrics.h" 27 #include "base/metrics/user_metrics.h"
28 #include "base/metrics/user_metrics_action.h" 28 #include "base/metrics/user_metrics_action.h"
29 #include "base/profiler/scoped_profile.h" 29 #include "base/profiler/scoped_profile.h"
30 #include "base/strings/string_number_conversions.h" 30 #include "base/strings/string_number_conversions.h"
31 #include "base/strings/string_split.h" 31 #include "base/strings/string_split.h"
32 #include "base/strings/string_tokenizer.h" 32 #include "base/strings/string_tokenizer.h"
33 #include "base/strings/utf_string_conversions.h" 33 #include "base/strings/utf_string_conversions.h"
34 #include "base/threading/thread_restrictions.h" 34 #include "base/threading/thread_restrictions.h"
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 } 873 }
874 874
875 // If we are showing the app list then chrome isn't shown so load the app 875 // If we are showing the app list then chrome isn't shown so load the app
876 // list's profile rather than chrome's. 876 // list's profile rather than chrome's.
877 if (command_line.HasSwitch(switches::kShowAppList)) 877 if (command_line.HasSwitch(switches::kShowAppList))
878 return AppListService::Get()->GetProfilePath(user_data_dir); 878 return AppListService::Get()->GetProfilePath(user_data_dir);
879 879
880 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 880 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
881 user_data_dir); 881 user_data_dir);
882 } 882 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698