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

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: avoid changes to GlobalConfirmInfoBar Created 3 years, 10 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/startup_browser_creator.h" 75 #include "chrome/browser/ui/startup/startup_browser_creator.h"
75 #include "chrome/browser/ui/startup/startup_features.h" 76 #include "chrome/browser/ui/startup/startup_features.h"
76 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 77 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
77 #include "chrome/browser/ui/tabs/tab_strip_model.h" 78 #include "chrome/browser/ui/tabs/tab_strip_model.h"
78 #include "chrome/common/chrome_constants.h" 79 #include "chrome/common/chrome_constants.h"
79 #include "chrome/common/chrome_paths.h" 80 #include "chrome/common/chrome_paths.h"
80 #include "chrome/common/chrome_result_codes.h" 81 #include "chrome/common/chrome_result_codes.h"
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 if (!browser || !profile_ || browser->tab_strip_model()->count() == 0) 801 if (!browser || !profile_ || browser->tab_strip_model()->count() == 0)
801 return; 802 return;
802 803
803 if (HasPendingUncleanExit(browser->profile()) && 804 if (HasPendingUncleanExit(browser->profile()) &&
804 !SessionCrashedBubble::Show(browser)) { 805 !SessionCrashedBubble::Show(browser)) {
805 #if defined(OS_MACOSX) && !BUILDFLAG(MAC_VIEWS_BROWSER) 806 #if defined(OS_MACOSX) && !BUILDFLAG(MAC_VIEWS_BROWSER)
806 SessionCrashedInfoBarDelegate::Create(browser); 807 SessionCrashedInfoBarDelegate::Create(browser);
807 #endif 808 #endif
808 } 809 }
809 810
811 if (command_line_.HasSwitch(switches::kEnableChromeDriver))
812 ChromeDriverInfoBarDelegate::CreateAndShow(browser);
813
810 // The below info bars are only added to the first profile which is launched. 814 // The below info bars are only added to the first profile which is launched.
811 // Other profiles might be restoring the browsing sessions asynchronously, 815 // Other profiles might be restoring the browsing sessions asynchronously,
812 // so we cannot add the info bars to the focused tabs here. 816 // so we cannot add the info bars to the focused tabs here.
813 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP && 817 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
814 !command_line_.HasSwitch(switches::kTestType)) { 818 !command_line_.HasSwitch(switches::kTestType) &&
819 !command_line_.HasSwitch(switches::kEnableChromeDriver)) {
815 chrome::ShowBadFlagsPrompt(browser); 820 chrome::ShowBadFlagsPrompt(browser);
816 GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents( 821 GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents(
817 browser->tab_strip_model()->GetActiveWebContents())); 822 browser->tab_strip_model()->GetActiveWebContents()));
818 ObsoleteSystemInfoBarDelegate::Create(InfoBarService::FromWebContents( 823 ObsoleteSystemInfoBarDelegate::Create(InfoBarService::FromWebContents(
819 browser->tab_strip_model()->GetActiveWebContents())); 824 browser->tab_strip_model()->GetActiveWebContents()));
820 825
821 #if !defined(OS_CHROMEOS) 826 #if !defined(OS_CHROMEOS)
822 if (!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) { 827 if (!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
823 // Generally, the default browser prompt should not be shown on first 828 // Generally, the default browser prompt should not be shown on first
824 // run. However, when the set-as-default dialog has been suppressed, we 829 // run. However, when the set-as-default dialog has been suppressed, we
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1229 #if defined(OS_WIN) 1234 #if defined(OS_WIN)
1230 TriggeredProfileResetter* triggered_profile_resetter = 1235 TriggeredProfileResetter* triggered_profile_resetter =
1231 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); 1236 TriggeredProfileResetterFactory::GetForBrowserContext(profile_);
1232 // TriggeredProfileResetter instance will be nullptr for incognito profiles. 1237 // TriggeredProfileResetter instance will be nullptr for incognito profiles.
1233 if (triggered_profile_resetter) { 1238 if (triggered_profile_resetter) {
1234 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); 1239 has_reset_trigger = triggered_profile_resetter->HasResetTrigger();
1235 } 1240 }
1236 #endif // defined(OS_WIN) 1241 #endif // defined(OS_WIN)
1237 return has_reset_trigger; 1242 return has_reset_trigger;
1238 } 1243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698