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

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

Issue 2272173002: Fix most chrome/browser/ui "gn check" problems. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 4 years, 3 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 <memory>
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "components/signin/core/common/profile_management_switches.h" 70 #include "components/signin/core/common/profile_management_switches.h"
71 #include "components/url_formatter/url_fixer.h" 71 #include "components/url_formatter/url_fixer.h"
72 #include "content/public/browser/browser_thread.h" 72 #include "content/public/browser/browser_thread.h"
73 #include "content/public/browser/child_process_security_policy.h" 73 #include "content/public/browser/child_process_security_policy.h"
74 #include "content/public/browser/navigation_controller.h" 74 #include "content/public/browser/navigation_controller.h"
75 #include "content/public/common/content_switches.h" 75 #include "content/public/common/content_switches.h"
76 #include "extensions/common/switches.h" 76 #include "extensions/common/switches.h"
77 #include "net/base/port_util.h" 77 #include "net/base/port_util.h"
78 78
79 #if defined(USE_ASH) 79 #if defined(USE_ASH)
80 #include "ash/shell.h" 80 #include "ash/shell.h" // nogncheck
81 #endif 81 #endif
82 82
83 #if defined(OS_CHROMEOS) 83 #if defined(OS_CHROMEOS)
84 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" 84 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h"
85 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 85 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
86 #include "chrome/browser/chromeos/profiles/profile_helper.h" 86 #include "chrome/browser/chromeos/profiles/profile_helper.h"
87 #include "chrome/browser/lifetime/application_lifetime.h" 87 #include "chrome/browser/lifetime/application_lifetime.h"
88 #include "chromeos/chromeos_switches.h" 88 #include "chromeos/chromeos_switches.h"
89 #include "chromeos/cryptohome/cryptohome_parameters.h" 89 #include "chromeos/cryptohome/cryptohome_parameters.h"
90 #include "components/user_manager/user_manager.h" 90 #include "components/user_manager/user_manager.h"
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 if (!entry->IsSigninRequired()) { 953 if (!entry->IsSigninRequired()) {
954 Profile* profile = profile_manager->GetProfile(entry->GetPath()); 954 Profile* profile = profile_manager->GetProfile(entry->GetPath());
955 if (profile) 955 if (profile)
956 return profile; 956 return profile;
957 } 957 }
958 } 958 }
959 959
960 return nullptr; 960 return nullptr;
961 } 961 }
962 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 962 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698