OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/browser_init.h" | 5 #include "chrome/browser/browser_init.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
10 #include "app/win_util.h" | 10 #include "app/win_util.h" |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
460 } | 460 } |
461 | 461 |
462 if (open_splash) { | 462 if (open_splash) { |
463 browser->OpenURL(GURL("about:linux-splash"), GURL(), | 463 browser->OpenURL(GURL("about:linux-splash"), GURL(), |
464 NEW_FOREGROUND_TAB, PageTransition::START_PAGE); | 464 NEW_FOREGROUND_TAB, PageTransition::START_PAGE); |
465 } | 465 } |
466 } | 466 } |
467 } | 467 } |
468 #endif | 468 #endif |
469 // Check whether we are the default browser. | 469 // Check whether we are the default browser. |
470 if (!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) | 470 if (process_startup && |
| 471 !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) |
471 CheckDefaultBrowser(profile); | 472 CheckDefaultBrowser(profile); |
472 } else { | 473 } else { |
473 RecordLaunchModeHistogram(LM_AS_WEBAPP); | 474 RecordLaunchModeHistogram(LM_AS_WEBAPP); |
474 } | 475 } |
475 | 476 |
476 #if defined(OS_WIN) | 477 #if defined(OS_WIN) |
477 // Print the selected page if the command line switch exists. Note that the | 478 // Print the selected page if the command line switch exists. Note that the |
478 // current selected tab would be the page which will be printed. | 479 // current selected tab would be the page which will be printed. |
479 if (command_line_.HasSwitch(switches::kPrint)) { | 480 if (command_line_.HasSwitch(switches::kPrint)) { |
480 Browser* browser = BrowserList::GetLastActive(); | 481 Browser* browser = BrowserList::GetLastActive(); |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
850 scoped_refptr<AutomationProviderClass> automation = | 851 scoped_refptr<AutomationProviderClass> automation = |
851 new AutomationProviderClass(profile); | 852 new AutomationProviderClass(profile); |
852 automation->ConnectToChannel(channel_id); | 853 automation->ConnectToChannel(channel_id); |
853 automation->SetExpectedTabCount(expected_tabs); | 854 automation->SetExpectedTabCount(expected_tabs); |
854 | 855 |
855 AutomationProviderList* list = | 856 AutomationProviderList* list = |
856 g_browser_process->InitAutomationProviderList(); | 857 g_browser_process->InitAutomationProviderList(); |
857 DCHECK(list); | 858 DCHECK(list); |
858 list->AddProvider(automation); | 859 list->AddProvider(automation); |
859 } | 860 } |
OLD | NEW |