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

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

Issue 14977013: Delete Automation[Tab/Renderer]Helper and users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update now that 202087 is committed Created 7 years, 7 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
« no previous file with comments | « chrome/browser/ui/browser_tab_contents.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/bind.h" 10 #include "base/bind.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "chrome/common/chrome_notification_types.h" 54 #include "chrome/common/chrome_notification_types.h"
55 #include "chrome/common/chrome_paths.h" 55 #include "chrome/common/chrome_paths.h"
56 #include "chrome/common/chrome_result_codes.h" 56 #include "chrome/common/chrome_result_codes.h"
57 #include "chrome/common/chrome_switches.h" 57 #include "chrome/common/chrome_switches.h"
58 #include "chrome/common/chrome_version_info.h" 58 #include "chrome/common/chrome_version_info.h"
59 #include "chrome/common/pref_names.h" 59 #include "chrome/common/pref_names.h"
60 #include "chrome/common/url_constants.h" 60 #include "chrome/common/url_constants.h"
61 #include "chrome/installer/util/browser_distribution.h" 61 #include "chrome/installer/util/browser_distribution.h"
62 #include "content/public/browser/browser_thread.h" 62 #include "content/public/browser/browser_thread.h"
63 #include "content/public/browser/child_process_security_policy.h" 63 #include "content/public/browser/child_process_security_policy.h"
64 #include "content/public/browser/navigation_controller.h"
64 #include "grit/locale_settings.h" 65 #include "grit/locale_settings.h"
65 #include "net/base/net_util.h" 66 #include "net/base/net_util.h"
66 #include "ui/base/l10n/l10n_util.h" 67 #include "ui/base/l10n/l10n_util.h"
67 #include "ui/base/resource/resource_bundle.h" 68 #include "ui/base/resource/resource_bundle.h"
68 69
69 #if defined(OS_CHROMEOS) 70 #if defined(OS_CHROMEOS)
70 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h" 71 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
71 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 72 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
72 #include "chrome/browser/chromeos/login/user_manager.h" 73 #include "chrome/browser/chromeos/login/user_manager.h"
73 #include "chrome/browser/chromeos/profiles/profile_helper.h" 74 #include "chrome/browser/chromeos/profiles/profile_helper.h"
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 739
739 // static 740 // static
740 bool StartupBrowserCreator::ActivatedProfile() { 741 bool StartupBrowserCreator::ActivatedProfile() {
741 return profile_launch_observer.Get().activated_profile(); 742 return profile_launch_observer.Get().activated_profile();
742 } 743 }
743 744
744 bool HasPendingUncleanExit(Profile* profile) { 745 bool HasPendingUncleanExit(Profile* profile) {
745 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED && 746 return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
746 !profile_launch_observer.Get().HasBeenLaunched(profile); 747 !profile_launch_observer.Get().HasBeenLaunched(profile);
747 } 748 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_tab_contents.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698