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

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

Issue 454583002: Cleanup: Remove unneeded #includes for grit/, ui/base/l10n/l10n_util.h and ui/base/resource/resourc… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Cros some more Created 6 years, 4 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 (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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "chrome/common/pref_names.h" 56 #include "chrome/common/pref_names.h"
57 #include "chrome/common/url_constants.h" 57 #include "chrome/common/url_constants.h"
58 #include "chrome/installer/util/browser_distribution.h" 58 #include "chrome/installer/util/browser_distribution.h"
59 #include "components/google/core/browser/google_util.h" 59 #include "components/google/core/browser/google_util.h"
60 #include "components/search_engines/util.h" 60 #include "components/search_engines/util.h"
61 #include "components/signin/core/common/profile_management_switches.h" 61 #include "components/signin/core/common/profile_management_switches.h"
62 #include "components/url_fixer/url_fixer.h" 62 #include "components/url_fixer/url_fixer.h"
63 #include "content/public/browser/browser_thread.h" 63 #include "content/public/browser/browser_thread.h"
64 #include "content/public/browser/child_process_security_policy.h" 64 #include "content/public/browser/child_process_security_policy.h"
65 #include "content/public/browser/navigation_controller.h" 65 #include "content/public/browser/navigation_controller.h"
66 #include "grit/locale_settings.h"
67 #include "net/base/net_util.h" 66 #include "net/base/net_util.h"
68 #include "ui/base/l10n/l10n_util.h"
69 #include "ui/base/resource/resource_bundle.h"
70 67
71 #if defined(USE_ASH) 68 #if defined(USE_ASH)
72 #include "ash/shell.h" 69 #include "ash/shell.h"
73 #endif 70 #endif
74 71
75 #if defined(OS_CHROMEOS) 72 #if defined(OS_CHROMEOS)
76 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" 73 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h"
77 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 74 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
78 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 75 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
79 #include "chrome/browser/chromeos/login/users/user_manager.h" 76 #include "chrome/browser/chromeos/login/users/user_manager.h"
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 } 735 }
739 736
740 if (command_line.HasSwitch(switches::kProfileDirectory)) { 737 if (command_line.HasSwitch(switches::kProfileDirectory)) {
741 return user_data_dir.Append( 738 return user_data_dir.Append(
742 command_line.GetSwitchValuePath(switches::kProfileDirectory)); 739 command_line.GetSwitchValuePath(switches::kProfileDirectory));
743 } 740 }
744 741
745 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 742 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
746 user_data_dir); 743 user_data_dir);
747 } 744 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/search_ui.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