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

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

Issue 2564973002: Add an infobar if a session is being controlled by an automated test. (Closed)
Patch Set: tweak wording, temporarily re-introduce load-component-extension Created 3 years, 11 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_impl.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "chrome/browser/ui/browser_navigator.h" 61 #include "chrome/browser/ui/browser_navigator.h"
62 #include "chrome/browser/ui/browser_navigator_params.h" 62 #include "chrome/browser/ui/browser_navigator_params.h"
63 #include "chrome/browser/ui/browser_tabrestore.h" 63 #include "chrome/browser/ui/browser_tabrestore.h"
64 #include "chrome/browser/ui/browser_tabstrip.h" 64 #include "chrome/browser/ui/browser_tabstrip.h"
65 #include "chrome/browser/ui/browser_window.h" 65 #include "chrome/browser/ui/browser_window.h"
66 #include "chrome/browser/ui/chrome_pages.h" 66 #include "chrome/browser/ui/chrome_pages.h"
67 #include "chrome/browser/ui/extensions/app_launch_params.h" 67 #include "chrome/browser/ui/extensions/app_launch_params.h"
68 #include "chrome/browser/ui/extensions/application_launch.h" 68 #include "chrome/browser/ui/extensions/application_launch.h"
69 #include "chrome/browser/ui/session_crashed_bubble.h" 69 #include "chrome/browser/ui/session_crashed_bubble.h"
70 #include "chrome/browser/ui/startup/bad_flags_prompt.h" 70 #include "chrome/browser/ui/startup/bad_flags_prompt.h"
71 #include "chrome/browser/ui/startup/chromedriver_infobar_delegate.h"
71 #include "chrome/browser/ui/startup/default_browser_prompt.h" 72 #include "chrome/browser/ui/startup/default_browser_prompt.h"
72 #include "chrome/browser/ui/startup/google_api_keys_infobar_delegate.h" 73 #include "chrome/browser/ui/startup/google_api_keys_infobar_delegate.h"
73 #include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h" 74 #include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h"
74 #include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h" 75 #include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h"
75 #include "chrome/browser/ui/startup/startup_browser_creator.h" 76 #include "chrome/browser/ui/startup/startup_browser_creator.h"
76 #include "chrome/browser/ui/startup/startup_features.h" 77 #include "chrome/browser/ui/startup/startup_features.h"
77 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 78 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
78 #include "chrome/browser/ui/tabs/tab_strip_model.h" 79 #include "chrome/browser/ui/tabs/tab_strip_model.h"
79 #include "chrome/common/chrome_constants.h" 80 #include "chrome/common/chrome_constants.h"
80 #include "chrome/common/chrome_paths.h" 81 #include "chrome/common/chrome_paths.h"
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 Browser* browser, 794 Browser* browser,
794 chrome::startup::IsProcessStartup is_process_startup) { 795 chrome::startup::IsProcessStartup is_process_startup) {
795 if (!browser || !profile_ || browser->tab_strip_model()->count() == 0) 796 if (!browser || !profile_ || browser->tab_strip_model()->count() == 0)
796 return; 797 return;
797 798
798 if (HasPendingUncleanExit(browser->profile()) && 799 if (HasPendingUncleanExit(browser->profile()) &&
799 !SessionCrashedBubble::Show(browser)) { 800 !SessionCrashedBubble::Show(browser)) {
800 SessionCrashedInfoBarDelegate::Create(browser); 801 SessionCrashedInfoBarDelegate::Create(browser);
801 } 802 }
802 803
804 if (command_line_.HasSwitch(switches::kEnableChromeDriver))
805 ChromeDriverInfoBarDelegate::Create(browser);
Devlin 2017/02/01 23:05:00 This is pretty high-level. I wonder if we could p
806
803 // The below info bars are only added to the first profile which is launched. 807 // The below info bars are only added to the first profile which is launched.
804 // Other profiles might be restoring the browsing sessions asynchronously, 808 // Other profiles might be restoring the browsing sessions asynchronously,
805 // so we cannot add the info bars to the focused tabs here. 809 // so we cannot add the info bars to the focused tabs here.
806 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP && 810 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
807 !command_line_.HasSwitch(switches::kTestType)) { 811 !command_line_.HasSwitch(switches::kTestType) &&
812 !command_line_.HasSwitch(switches::kEnableChromeDriver)) {
808 chrome::ShowBadFlagsPrompt(browser); 813 chrome::ShowBadFlagsPrompt(browser);
809 GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents( 814 GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents(
810 browser->tab_strip_model()->GetActiveWebContents())); 815 browser->tab_strip_model()->GetActiveWebContents()));
811 ObsoleteSystemInfoBarDelegate::Create(InfoBarService::FromWebContents( 816 ObsoleteSystemInfoBarDelegate::Create(InfoBarService::FromWebContents(
812 browser->tab_strip_model()->GetActiveWebContents())); 817 browser->tab_strip_model()->GetActiveWebContents()));
813 818
814 #if !defined(OS_CHROMEOS) 819 #if !defined(OS_CHROMEOS)
815 if (!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) { 820 if (!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
816 // Generally, the default browser prompt should not be shown on first 821 // Generally, the default browser prompt should not be shown on first
817 // run. However, when the set-as-default dialog has been suppressed, we 822 // run. However, when the set-as-default dialog has been suppressed, we
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 #if defined(OS_WIN) 1227 #if defined(OS_WIN)
1223 TriggeredProfileResetter* triggered_profile_resetter = 1228 TriggeredProfileResetter* triggered_profile_resetter =
1224 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); 1229 TriggeredProfileResetterFactory::GetForBrowserContext(profile_);
1225 // TriggeredProfileResetter instance will be nullptr for incognito profiles. 1230 // TriggeredProfileResetter instance will be nullptr for incognito profiles.
1226 if (triggered_profile_resetter) { 1231 if (triggered_profile_resetter) {
1227 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); 1232 has_reset_trigger = triggered_profile_resetter->HasResetTrigger();
1228 } 1233 }
1229 #endif // defined(OS_WIN) 1234 #endif // defined(OS_WIN)
1230 return has_reset_trigger; 1235 return has_reset_trigger;
1231 } 1236 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698