| Index: chrome/browser/ui/startup/startup_browser_creator.cc
|
| ===================================================================
|
| --- chrome/browser/ui/startup/startup_browser_creator.cc (revision 136582)
|
| +++ chrome/browser/ui/startup/startup_browser_creator.cc (working copy)
|
| @@ -9,9 +9,9 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| +#include "base/command_line.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/environment.h"
|
| -#include "base/event_recorder.h"
|
| #include "base/file_path.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -33,15 +33,9 @@
|
| #include "chrome/browser/component_updater/recovery_component_installer.h"
|
| #include "chrome/browser/component_updater/swiftshader_component_installer.h"
|
| #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
|
| -#include "chrome/browser/defaults.h"
|
| -#include "chrome/browser/extensions/extension_creator.h"
|
| -#include "chrome/browser/extensions/extension_service.h"
|
| -#include "chrome/browser/extensions/pack_extension_job.h"
|
| #include "chrome/browser/first_run/first_run.h"
|
| #include "chrome/browser/google/google_util.h"
|
| -#include "chrome/browser/infobars/infobar_tab_helper.h"
|
| #include "chrome/browser/net/crl_set_fetcher.h"
|
| -#include "chrome/browser/net/predictor.h"
|
| #include "chrome/browser/net/url_fixer_upper.h"
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| #include "chrome/browser/prefs/incognito_mode_prefs.h"
|
| @@ -51,49 +45,22 @@
|
| #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
|
| #include "chrome/browser/printing/print_dialog_cloud.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/profiles/profile_io_data.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| -#include "chrome/browser/protector/base_setting_change.h"
|
| -#include "chrome/browser/protector/protected_prefs_watcher.h"
|
| -#include "chrome/browser/protector/protector_service.h"
|
| -#include "chrome/browser/protector/protector_service_factory.h"
|
| -#include "chrome/browser/protector/protector_utils.h"
|
| #include "chrome/browser/search_engines/template_url.h"
|
| #include "chrome/browser/search_engines/template_url_service.h"
|
| #include "chrome/browser/search_engines/template_url_service_factory.h"
|
| -#include "chrome/browser/sessions/session_restore.h"
|
| -#include "chrome/browser/sessions/session_service.h"
|
| -#include "chrome/browser/sessions/session_service_factory.h"
|
| -#include "chrome/browser/shell_integration.h"
|
| -#include "chrome/browser/tab_contents/link_infobar_delegate.h"
|
| -#include "chrome/browser/tabs/pinned_tab_codec.h"
|
| -#include "chrome/browser/tabs/tab_strip_model.h"
|
| -#include "chrome/browser/ui/browser_list.h"
|
| -#include "chrome/browser/ui/browser_navigator.h"
|
| -#include "chrome/browser/ui/browser_window.h"
|
| -#include "chrome/browser/ui/startup/autolaunch_prompt.h"
|
| -#include "chrome/browser/ui/startup/bad_flags_prompt.h"
|
| -#include "chrome/browser/ui/startup/default_browser_prompt.h"
|
| -#include "chrome/browser/ui/startup/obsolete_os_prompt.h"
|
| -#include "chrome/browser/ui/startup/session_crashed_prompt.h"
|
| -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| -#include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
|
| -#include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
|
| -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
|
| +#include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_result_codes.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/chrome_version_info.h"
|
| -#include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/installer/util/browser_distribution.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/child_process_security_policy.h"
|
| -#include "content/public/browser/web_contents.h"
|
| -#include "content/public/browser/web_contents_view.h"
|
| #include "grit/locale_settings.h"
|
| #include "net/base/net_util.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -103,163 +70,21 @@
|
| #include "chrome/browser/chromeos/profile_startup.h"
|
| #endif
|
|
|
| -#if defined(OS_MACOSX)
|
| -#include "base/mac/mac_util.h"
|
| -#include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h"
|
| -#endif
|
| -
|
| -#if defined(TOOLKIT_GTK)
|
| -#include "chrome/browser/ui/gtk/gtk_util.h"
|
| -#endif
|
| -
|
| #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
|
| #include "ui/base/touch/touch_factory.h"
|
| #endif
|
|
|
| #if defined(OS_WIN)
|
| -#include "base/win/windows_version.h"
|
| #include "chrome/browser/ui/startup/startup_browser_creator_win.h"
|
| #endif
|
|
|
| using content::BrowserThread;
|
| using content::ChildProcessSecurityPolicy;
|
| -using content::WebContents;
|
| -using protector::BaseSettingChange;
|
| -using protector::ProtectedPrefsWatcher;
|
| -using protector::ProtectorService;
|
| -using protector::ProtectorServiceFactory;
|
|
|
| -namespace {
|
| -
|
| bool in_synchronous_profile_launch = false;
|
|
|
| -// Utility functions ----------------------------------------------------------
|
| +namespace {
|
|
|
| -enum LaunchMode {
|
| - LM_TO_BE_DECIDED = 0, // Possibly direct launch or via a shortcut.
|
| - LM_AS_WEBAPP, // Launched as a installed web application.
|
| - LM_WITH_URLS, // Launched with urls in the cmd line.
|
| - LM_SHORTCUT_NONE, // Not launched from a shortcut.
|
| - LM_SHORTCUT_NONAME, // Launched from shortcut but no name available.
|
| - LM_SHORTCUT_UNKNOWN, // Launched from user-defined shortcut.
|
| - LM_SHORTCUT_QUICKLAUNCH, // Launched from the quick launch bar.
|
| - LM_SHORTCUT_DESKTOP, // Launched from a desktop shortcut.
|
| - LM_SHORTCUT_TASKBAR, // Launched from the taskbar.
|
| - LM_LINUX_MAC_BEOS // Other OS buckets start here.
|
| -};
|
| -
|
| -#if defined(OS_WIN)
|
| -// Undocumented flag in the startup info structure tells us what shortcut was
|
| -// used to launch the browser. See http://www.catch22.net/tuts/undoc01 for
|
| -// more information. Confirmed to work on XP, Vista and Win7.
|
| -LaunchMode GetLaunchShortcutKind() {
|
| - STARTUPINFOW si = { sizeof(si) };
|
| - GetStartupInfoW(&si);
|
| - if (si.dwFlags & 0x800) {
|
| - if (!si.lpTitle)
|
| - return LM_SHORTCUT_NONAME;
|
| - string16 shortcut(si.lpTitle);
|
| - // The windows quick launch path is not localized.
|
| - if (shortcut.find(L"\\Quick Launch\\") != string16::npos) {
|
| - if (base::win::GetVersion() >= base::win::VERSION_WIN7)
|
| - return LM_SHORTCUT_TASKBAR;
|
| - else
|
| - return LM_SHORTCUT_QUICKLAUNCH;
|
| - }
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| - std::string appdata_path;
|
| - env->GetVar("USERPROFILE", &appdata_path);
|
| - if (!appdata_path.empty() &&
|
| - shortcut.find(ASCIIToWide(appdata_path)) != std::wstring::npos)
|
| - return LM_SHORTCUT_DESKTOP;
|
| - return LM_SHORTCUT_UNKNOWN;
|
| - }
|
| - return LM_SHORTCUT_NONE;
|
| -}
|
| -#else
|
| -// TODO(cpu): Port to other platforms.
|
| -LaunchMode GetLaunchShortcutKind() {
|
| - return LM_LINUX_MAC_BEOS;
|
| -}
|
| -#endif
|
| -
|
| -// Log in a histogram the frequency of launching by the different methods. See
|
| -// LaunchMode enum for the actual values of the buckets.
|
| -void RecordLaunchModeHistogram(LaunchMode mode) {
|
| - int bucket = (mode == LM_TO_BE_DECIDED) ? GetLaunchShortcutKind() : mode;
|
| - UMA_HISTOGRAM_COUNTS_100("Launch.Modes", bucket);
|
| -}
|
| -
|
| -GURL GetWelcomePageURL() {
|
| - std::string welcome_url = l10n_util::GetStringUTF8(IDS_WELCOME_PAGE_URL);
|
| - return GURL(welcome_url);
|
| -}
|
| -
|
| -void UrlsToTabs(
|
| - const std::vector<GURL>& urls,
|
| - std::vector<StartupBrowserCreator::LaunchWithProfile::Tab>* tabs) {
|
| - for (size_t i = 0; i < urls.size(); ++i) {
|
| - StartupBrowserCreator::LaunchWithProfile::Tab tab;
|
| - tab.is_pinned = false;
|
| - tab.url = urls[i];
|
| - tabs->push_back(tab);
|
| - }
|
| -}
|
| -
|
| -// Return true if the command line option --app-id is used. Set
|
| -// |out_extension| to the app to open, and |out_launch_container|
|
| -// to the type of window into which the app should be open.
|
| -bool GetAppLaunchContainer(
|
| - Profile* profile,
|
| - const std::string& app_id,
|
| - const Extension** out_extension,
|
| - extension_misc::LaunchContainer* out_launch_container) {
|
| -
|
| - ExtensionService* extensions_service = profile->GetExtensionService();
|
| - const Extension* extension =
|
| - extensions_service->GetExtensionById(app_id, false);
|
| -
|
| - // The extension with id |app_id| may have been uninstalled.
|
| - if (!extension)
|
| - return false;
|
| -
|
| - // Look at preferences to find the right launch container. If no
|
| - // preference is set, launch as a window.
|
| - extension_misc::LaunchContainer launch_container =
|
| - extensions_service->extension_prefs()->GetLaunchContainer(
|
| - extension, ExtensionPrefs::LAUNCH_WINDOW);
|
| -
|
| - *out_extension = extension;
|
| - *out_launch_container = launch_container;
|
| - return true;
|
| -}
|
| -
|
| -void RecordCmdLineAppHistogram() {
|
| - AppLauncherHandler::RecordAppLaunchType(
|
| - extension_misc::APP_LAUNCH_CMD_LINE_APP);
|
| -}
|
| -
|
| -void RecordAppLaunches(
|
| - Profile* profile,
|
| - const std::vector<GURL>& cmd_line_urls,
|
| - const std::vector<StartupBrowserCreator::LaunchWithProfile::Tab>&
|
| - autolaunch_tabs) {
|
| - ExtensionService* extension_service = profile->GetExtensionService();
|
| - DCHECK(extension_service);
|
| - for (size_t i = 0; i < cmd_line_urls.size(); ++i) {
|
| - if (extension_service->IsInstalledApp(cmd_line_urls.at(i))) {
|
| - AppLauncherHandler::RecordAppLaunchType(
|
| - extension_misc::APP_LAUNCH_CMD_LINE_URL);
|
| - }
|
| - }
|
| - for (size_t i = 0; i < autolaunch_tabs.size(); ++i) {
|
| - if (extension_service->IsInstalledApp(autolaunch_tabs.at(i).url)) {
|
| - AppLauncherHandler::RecordAppLaunchType(
|
| - extension_misc::APP_LAUNCH_AUTOLAUNCH);
|
| - }
|
| - }
|
| -}
|
| -
|
| void RegisterComponentsForUpdate(const CommandLine& command_line) {
|
| ComponentUpdateService* cus = g_browser_process->component_updater();
|
| if (!cus)
|
| @@ -326,13 +151,6 @@
|
| base::LazyInstance<ProfileLaunchObserver> profile_launch_observer =
|
| LAZY_INSTANCE_INITIALIZER;
|
|
|
| -// Returns true if |profile| has exited uncleanly and has not been launched
|
| -// after the unclean exit.
|
| -bool HasPendingUncleanExit(Profile* profile) {
|
| - return !profile->DidLastSessionExitCleanly() &&
|
| - !profile_launch_observer.Get().HasBeenLaunched(profile);
|
| -}
|
| -
|
| } // namespace
|
|
|
| StartupBrowserCreator::StartupBrowserCreator() {}
|
| @@ -351,13 +169,15 @@
|
| return in_synchronous_profile_launch;
|
| }
|
|
|
| -bool StartupBrowserCreator::LaunchBrowser(const CommandLine& command_line,
|
| - Profile* profile,
|
| - const FilePath& cur_dir,
|
| - IsProcessStartup process_startup,
|
| - IsFirstRun is_first_run,
|
| - int* return_code) {
|
| - in_synchronous_profile_launch = process_startup == IS_PROCESS_STARTUP;
|
| +bool StartupBrowserCreator::LaunchBrowser(
|
| + const CommandLine& command_line,
|
| + Profile* profile,
|
| + const FilePath& cur_dir,
|
| + browser::startup::IsProcessStartup process_startup,
|
| + browser::startup::IsFirstRun is_first_run,
|
| + int* return_code) {
|
| + in_synchronous_profile_launch =
|
| + process_startup == browser::startup::IS_PROCESS_STARTUP;
|
| DCHECK(profile);
|
|
|
| // Continue with the incognito profile from here on if Incognito mode
|
| @@ -370,8 +190,7 @@
|
| << "browser session.";
|
| }
|
|
|
| - StartupBrowserCreator::LaunchWithProfile lwp(cur_dir, command_line, this,
|
| - is_first_run);
|
| + StartupBrowserCreatorImpl lwp(cur_dir, command_line, this, is_first_run);
|
| std::vector<GURL> urls_to_launch =
|
| StartupBrowserCreator::GetURLsFromCommandLine(command_line, cur_dir,
|
| profile);
|
| @@ -432,657 +251,6 @@
|
| return pref;
|
| }
|
|
|
| -
|
| -// StartupBrowserCreator::LaunchWithProfile::Tab -------------------------------
|
| -
|
| -StartupBrowserCreator::LaunchWithProfile::Tab::Tab()
|
| - : is_app(false),
|
| - is_pinned(true) {
|
| -}
|
| -
|
| -StartupBrowserCreator::LaunchWithProfile::Tab::~Tab() {
|
| -}
|
| -
|
| -// StartupBrowserCreator::LaunchWithProfile ------------------------------------
|
| -
|
| -StartupBrowserCreator::LaunchWithProfile::LaunchWithProfile(
|
| - const FilePath& cur_dir,
|
| - const CommandLine& command_line,
|
| - IsFirstRun is_first_run)
|
| - : cur_dir_(cur_dir),
|
| - command_line_(command_line),
|
| - profile_(NULL),
|
| - browser_creator_(NULL),
|
| - is_first_run_(is_first_run == IS_FIRST_RUN) {
|
| -}
|
| -
|
| -StartupBrowserCreator::LaunchWithProfile::LaunchWithProfile(
|
| - const FilePath& cur_dir,
|
| - const CommandLine& command_line,
|
| - StartupBrowserCreator* browser_creator,
|
| - IsFirstRun is_first_run)
|
| - : cur_dir_(cur_dir),
|
| - command_line_(command_line),
|
| - profile_(NULL),
|
| - browser_creator_(browser_creator),
|
| - is_first_run_(is_first_run == IS_FIRST_RUN) {
|
| -}
|
| -
|
| -StartupBrowserCreator::LaunchWithProfile::~LaunchWithProfile() {
|
| -}
|
| -
|
| -bool StartupBrowserCreator::LaunchWithProfile::Launch(
|
| - Profile* profile,
|
| - const std::vector<GURL>& urls_to_open,
|
| - bool process_startup) {
|
| - DCHECK(profile);
|
| - profile_ = profile;
|
| -
|
| - if (command_line_.HasSwitch(switches::kDnsLogDetails))
|
| - chrome_browser_net::EnablePredictorDetailedLog(true);
|
| - if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) &&
|
| - profile->GetNetworkPredictor()) {
|
| - profile->GetNetworkPredictor()->EnablePredictor(false);
|
| - }
|
| -
|
| - if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit))
|
| - base::StatisticsRecorder::set_dump_on_exit(true);
|
| -
|
| - if (command_line_.HasSwitch(switches::kRemoteDebuggingPort)) {
|
| - std::string port_str =
|
| - command_line_.GetSwitchValueASCII(switches::kRemoteDebuggingPort);
|
| - int64 port;
|
| - if (base::StringToInt64(port_str, &port) && port > 0 && port < 65535) {
|
| - std::string frontend_str;
|
| - if (command_line_.HasSwitch(switches::kRemoteDebuggingFrontend)) {
|
| - frontend_str = command_line_.GetSwitchValueASCII(
|
| - switches::kRemoteDebuggingFrontend);
|
| - }
|
| - g_browser_process->InitDevToolsHttpProtocolHandler(
|
| - profile,
|
| - "127.0.0.1",
|
| - static_cast<int>(port),
|
| - frontend_str);
|
| - } else {
|
| - DLOG(WARNING) << "Invalid http debugger port number " << port;
|
| - }
|
| - }
|
| -
|
| - // Open the required browser windows and tabs. First, see if
|
| - // we're being run as an application window. If so, the user
|
| - // opened an app shortcut. Don't restore tabs or open initial
|
| - // URLs in that case. The user should see the window as an app,
|
| - // not as chrome.
|
| - // Special case is when app switches are passed but we do want to restore
|
| - // session. In that case open app window + focus it after session is restored.
|
| - if (OpenApplicationWindow(profile) && !browser_defaults::kAppRestoreSession) {
|
| - RecordLaunchModeHistogram(LM_AS_WEBAPP);
|
| - } else {
|
| - Browser* browser_to_focus = NULL;
|
| - // In case of app mode + session restore we want to focus that app.
|
| - if (browser_defaults::kAppRestoreSession)
|
| - browser_to_focus = BrowserList::GetLastActive();
|
| -
|
| - RecordLaunchModeHistogram(urls_to_open.empty()?
|
| - LM_TO_BE_DECIDED : LM_WITH_URLS);
|
| -
|
| - // Notify user if the Preferences backup is invalid or changes to settings
|
| - // affecting browser startup have been detected.
|
| - CheckPreferencesBackup(profile);
|
| -
|
| - ProcessLaunchURLs(process_startup, urls_to_open);
|
| -
|
| - // If this is an app launch, but we didn't open an app window, it may
|
| - // be an app tab.
|
| - OpenApplicationTab(profile);
|
| -
|
| - if (browser_to_focus)
|
| - browser_to_focus->GetSelectedWebContents()->GetView()->SetInitialFocus();
|
| -
|
| - if (process_startup) {
|
| - if (browser_defaults::kOSSupportsOtherBrowsers &&
|
| - !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
|
| - if (!browser::ShowAutolaunchPrompt(profile))
|
| - browser::ShowDefaultBrowserPrompt(profile);
|
| - }
|
| -#if defined(OS_MACOSX)
|
| - // Check whether the auto-update system needs to be promoted from user
|
| - // to system.
|
| - KeystoneInfoBar::PromotionInfoBar(profile);
|
| -#endif
|
| - }
|
| - }
|
| -
|
| -#if defined(OS_WIN)
|
| - // Print the selected page if the command line switch exists. Note that the
|
| - // current selected tab would be the page which will be printed.
|
| - if (command_line_.HasSwitch(switches::kPrint)) {
|
| - Browser* browser = BrowserList::GetLastActive();
|
| - browser->Print();
|
| - }
|
| -#endif
|
| -
|
| - // If we're recording or playing back, startup the EventRecorder now
|
| - // unless otherwise specified.
|
| - if (!command_line_.HasSwitch(switches::kNoEvents)) {
|
| - FilePath script_path;
|
| - PathService::Get(chrome::FILE_RECORDED_SCRIPT, &script_path);
|
| -
|
| - bool record_mode = command_line_.HasSwitch(switches::kRecordMode);
|
| - bool playback_mode = command_line_.HasSwitch(switches::kPlaybackMode);
|
| -
|
| - if (record_mode && chrome::kRecordModeEnabled)
|
| - base::EventRecorder::current()->StartRecording(script_path);
|
| - if (playback_mode)
|
| - base::EventRecorder::current()->StartPlayback(script_path);
|
| - }
|
| -
|
| -#if defined(OS_WIN)
|
| - if (process_startup)
|
| - ShellIntegration::MigrateChromiumShortcuts();
|
| -#endif // defined(OS_WIN)
|
| -
|
| - return true;
|
| -}
|
| -
|
| -bool StartupBrowserCreator::LaunchWithProfile::IsAppLaunch(
|
| - std::string* app_url,
|
| - std::string* app_id) {
|
| - if (command_line_.HasSwitch(switches::kApp)) {
|
| - if (app_url)
|
| - *app_url = command_line_.GetSwitchValueASCII(switches::kApp);
|
| - return true;
|
| - }
|
| - if (command_line_.HasSwitch(switches::kAppId)) {
|
| - if (app_id)
|
| - *app_id = command_line_.GetSwitchValueASCII(switches::kAppId);
|
| - return true;
|
| - }
|
| - return false;
|
| -}
|
| -
|
| -bool StartupBrowserCreator::LaunchWithProfile::OpenApplicationTab(
|
| - Profile* profile) {
|
| - std::string app_id;
|
| - // App shortcuts to URLs always open in an app window. Because this
|
| - // function will open an app that should be in a tab, there is no need
|
| - // to look at the app URL. OpenApplicationWindow() will open app url
|
| - // shortcuts.
|
| - if (!IsAppLaunch(NULL, &app_id) || app_id.empty())
|
| - return false;
|
| -
|
| - extension_misc::LaunchContainer launch_container;
|
| - const Extension* extension;
|
| - if (!GetAppLaunchContainer(profile, app_id, &extension, &launch_container))
|
| - return false;
|
| -
|
| - // If the user doesn't want to open a tab, fail.
|
| - if (launch_container != extension_misc::LAUNCH_TAB)
|
| - return false;
|
| -
|
| - RecordCmdLineAppHistogram();
|
| -
|
| - WebContents* app_tab = Browser::OpenApplicationTab(profile, extension, GURL(),
|
| - NEW_FOREGROUND_TAB);
|
| - return (app_tab != NULL);
|
| -}
|
| -
|
| -bool StartupBrowserCreator::LaunchWithProfile::OpenApplicationWindow(
|
| - Profile* profile) {
|
| - std::string url_string, app_id;
|
| - if (!IsAppLaunch(&url_string, &app_id))
|
| - return false;
|
| -
|
| - // This can fail if the app_id is invalid. It can also fail if the
|
| - // extension is external, and has not yet been installed.
|
| - // TODO(skerner): Do something reasonable here. Pop up a warning panel?
|
| - // Open an URL to the gallery page of the extension id?
|
| - if (!app_id.empty()) {
|
| - extension_misc::LaunchContainer launch_container;
|
| - const Extension* extension;
|
| - if (!GetAppLaunchContainer(profile, app_id, &extension, &launch_container))
|
| - return false;
|
| -
|
| - // TODO(skerner): Could pass in |extension| and |launch_container|,
|
| - // and avoid calling GetAppLaunchContainer() both here and in
|
| - // OpenApplicationTab().
|
| -
|
| - if (launch_container == extension_misc::LAUNCH_TAB)
|
| - return false;
|
| -
|
| - RecordCmdLineAppHistogram();
|
| - WebContents* tab_in_app_window = Browser::OpenApplication(
|
| - profile, extension, launch_container, GURL(), NEW_WINDOW);
|
| - // Platform apps fire off a launch event which may or may not open a window.
|
| - return (tab_in_app_window != NULL || extension->is_platform_app());
|
| - }
|
| -
|
| - if (url_string.empty())
|
| - return false;
|
| -
|
| -#if defined(OS_WIN) // Fix up Windows shortcuts.
|
| - ReplaceSubstringsAfterOffset(&url_string, 0, "\\x", "%");
|
| -#endif
|
| - GURL url(url_string);
|
| -
|
| - // Restrict allowed URLs for --app switch.
|
| - if (!url.is_empty() && url.is_valid()) {
|
| - ChildProcessSecurityPolicy *policy =
|
| - ChildProcessSecurityPolicy::GetInstance();
|
| - if (policy->IsWebSafeScheme(url.scheme()) ||
|
| - url.SchemeIs(chrome::kFileScheme)) {
|
| -
|
| - if (profile->GetExtensionService()->IsInstalledApp(url)) {
|
| - RecordCmdLineAppHistogram();
|
| - } else {
|
| - AppLauncherHandler::RecordAppLaunchType(
|
| - extension_misc::APP_LAUNCH_CMD_LINE_APP_LEGACY);
|
| - }
|
| - WebContents* app_tab = Browser::OpenAppShortcutWindow(
|
| - profile,
|
| - url,
|
| - true); // Update app info.
|
| - return (app_tab != NULL);
|
| - }
|
| - }
|
| - return false;
|
| -}
|
| -
|
| -void StartupBrowserCreator::LaunchWithProfile::ProcessLaunchURLs(
|
| - bool process_startup,
|
| - const std::vector<GURL>& urls_to_open) {
|
| - // If we're starting up in "background mode" (no open browser window) then
|
| - // don't open any browser windows, unless kAutoLaunchAtStartup is also
|
| - // specified.
|
| - if (process_startup &&
|
| - command_line_.HasSwitch(switches::kNoStartupWindow) &&
|
| - !command_line_.HasSwitch(switches::kAutoLaunchAtStartup)) {
|
| - return;
|
| - }
|
| -
|
| - if (process_startup && ProcessStartupURLs(urls_to_open)) {
|
| - // ProcessStartupURLs processed the urls, nothing else to do.
|
| - return;
|
| - }
|
| -
|
| - IsProcessStartup is_process_startup = process_startup ?
|
| - IS_PROCESS_STARTUP : IS_NOT_PROCESS_STARTUP;
|
| - if (!process_startup) {
|
| - // Even if we're not starting a new process, this may conceptually be
|
| - // "startup" for the user and so should be handled in a similar way. Eg.,
|
| - // Chrome may have been running in the background due to an app with a
|
| - // background page being installed, or running with only an app window
|
| - // displayed.
|
| - SessionService* service = SessionServiceFactory::GetForProfile(profile_);
|
| - if (service && service->ShouldNewWindowStartSession()) {
|
| - // Restore the last session if any.
|
| - if (!HasPendingUncleanExit(profile_) &&
|
| - service->RestoreIfNecessary(urls_to_open)) {
|
| - return;
|
| - }
|
| - // Open user-specified URLs like pinned tabs and startup tabs.
|
| - Browser* browser = ProcessSpecifiedURLs(urls_to_open);
|
| - if (browser) {
|
| - AddInfoBarsIfNecessary(browser, is_process_startup);
|
| - return;
|
| - }
|
| - }
|
| - }
|
| -
|
| - // Session startup didn't occur, open the urls.
|
| -
|
| - Browser* browser = NULL;
|
| - std::vector<GURL> adjust_urls = urls_to_open;
|
| - if (adjust_urls.empty())
|
| - AddStartupURLs(&adjust_urls);
|
| - else if (!command_line_.HasSwitch(switches::kOpenInNewWindow))
|
| - browser = BrowserList::GetLastActiveWithProfile(profile_);
|
| -
|
| - // This will launch a browser; prevent session restore.
|
| - in_synchronous_profile_launch = true;
|
| - browser = OpenURLsInBrowser(browser, process_startup, adjust_urls);
|
| - in_synchronous_profile_launch = false;
|
| - AddInfoBarsIfNecessary(browser, is_process_startup);
|
| -}
|
| -
|
| -bool StartupBrowserCreator::LaunchWithProfile::ProcessStartupURLs(
|
| - const std::vector<GURL>& urls_to_open) {
|
| - SessionStartupPref pref = GetSessionStartupPref(command_line_, profile_);
|
| -
|
| - if (pref.type == SessionStartupPref::LAST) {
|
| - if (!profile_->DidLastSessionExitCleanly() &&
|
| - !command_line_.HasSwitch(switches::kRestoreLastSession)) {
|
| - // The last session crashed. It's possible automatically loading the
|
| - // page will trigger another crash, locking the user out of chrome.
|
| - // To avoid this, don't restore on startup but instead show the crashed
|
| - // infobar.
|
| - return false;
|
| - }
|
| -
|
| - uint32 restore_behavior = SessionRestore::SYNCHRONOUS |
|
| - SessionRestore::ALWAYS_CREATE_TABBED_BROWSER;
|
| -#if defined(OS_MACOSX)
|
| - // On Mac, when restoring a session with no windows, suppress the creation
|
| - // of a new window in the case where the system is launching Chrome via a
|
| - // login item or Lion's resume feature.
|
| - if (base::mac::WasLaunchedAsLoginOrResumeItem()) {
|
| - restore_behavior = restore_behavior &
|
| - ~SessionRestore::ALWAYS_CREATE_TABBED_BROWSER;
|
| - }
|
| -#endif
|
| -
|
| - Browser* browser = SessionRestore::RestoreSession(profile_,
|
| - NULL,
|
| - restore_behavior,
|
| - urls_to_open);
|
| - AddInfoBarsIfNecessary(browser, IS_PROCESS_STARTUP);
|
| - return true;
|
| - }
|
| -
|
| - Browser* browser = ProcessSpecifiedURLs(urls_to_open);
|
| - if (!browser)
|
| - return false;
|
| -
|
| - AddInfoBarsIfNecessary(browser, IS_PROCESS_STARTUP);
|
| - return true;
|
| -}
|
| -
|
| -Browser* StartupBrowserCreator::LaunchWithProfile::ProcessSpecifiedURLs(
|
| - const std::vector<GURL>& urls_to_open) {
|
| - SessionStartupPref pref = GetSessionStartupPref(command_line_, profile_);
|
| - std::vector<Tab> tabs;
|
| - // Pinned tabs should not be displayed when chrome is launched in incognito
|
| - // mode. Also, no pages should be opened automatically if the session
|
| - // crashed. Otherwise it might trigger another crash, locking the user out of
|
| - // chrome. The crash infobar is shown in this case.
|
| - if (!IncognitoModePrefs::ShouldLaunchIncognito(command_line_,
|
| - profile_->GetPrefs()) &&
|
| - !HasPendingUncleanExit(profile_)) {
|
| - tabs = PinnedTabCodec::ReadPinnedTabs(profile_);
|
| - }
|
| -
|
| - RecordAppLaunches(profile_, urls_to_open, tabs);
|
| -
|
| - if (!urls_to_open.empty()) {
|
| - // If urls were specified on the command line, use them.
|
| - UrlsToTabs(urls_to_open, &tabs);
|
| - } else if (pref.type == SessionStartupPref::URLS && !pref.urls.empty() &&
|
| - !HasPendingUncleanExit(profile_)) {
|
| - // Only use the set of urls specified in preferences if nothing was
|
| - // specified on the command line. Filter out any urls that are to be
|
| - // restored by virtue of having been previously pinned.
|
| - AddUniqueURLs(pref.urls, &tabs);
|
| - } else if (pref.type == SessionStartupPref::DEFAULT) {
|
| - std::vector<GURL> urls;
|
| - AddStartupURLs(&urls);
|
| - UrlsToTabs(urls, &tabs);
|
| -
|
| - } else if (pref.type == SessionStartupPref::HOMEPAGE) {
|
| - // If 'homepage' selected, either by the user or by a policy, we should
|
| - // have migrated them to another value.
|
| - NOTREACHED() << "SessionStartupPref has deprecated type HOMEPAGE";
|
| - }
|
| -
|
| - if (tabs.empty())
|
| - return NULL;
|
| -
|
| - Browser* browser = OpenTabsInBrowser(NULL, true, tabs);
|
| - return browser;
|
| -}
|
| -
|
| -void StartupBrowserCreator::LaunchWithProfile::AddUniqueURLs(
|
| - const std::vector<GURL>& urls,
|
| - std::vector<Tab>* tabs) {
|
| - size_t num_existing_tabs = tabs->size();
|
| - for (size_t i = 0; i < urls.size(); ++i) {
|
| - bool in_tabs = false;
|
| - for (size_t j = 0; j < num_existing_tabs; ++j) {
|
| - if (urls[i] == (*tabs)[j].url) {
|
| - in_tabs = true;
|
| - break;
|
| - }
|
| - }
|
| - if (!in_tabs) {
|
| - StartupBrowserCreator::LaunchWithProfile::Tab tab;
|
| - tab.is_pinned = false;
|
| - tab.url = urls[i];
|
| - tabs->push_back(tab);
|
| - }
|
| - }
|
| -}
|
| -
|
| -Browser* StartupBrowserCreator::LaunchWithProfile::OpenURLsInBrowser(
|
| - Browser* browser,
|
| - bool process_startup,
|
| - const std::vector<GURL>& urls) {
|
| - std::vector<Tab> tabs;
|
| - UrlsToTabs(urls, &tabs);
|
| - return OpenTabsInBrowser(browser, process_startup, tabs);
|
| -}
|
| -
|
| -Browser* StartupBrowserCreator::LaunchWithProfile::OpenTabsInBrowser(
|
| - Browser* browser,
|
| - bool process_startup,
|
| - const std::vector<Tab>& tabs) {
|
| - DCHECK(!tabs.empty());
|
| -
|
| - // If we don't yet have a profile, try to use the one we're given from
|
| - // |browser|. While we may not end up actually using |browser| (since it
|
| - // could be a popup window), we can at least use the profile.
|
| - if (!profile_ && browser)
|
| - profile_ = browser->profile();
|
| -
|
| - if (!browser || !browser->is_type_tabbed()) {
|
| - browser = Browser::Create(profile_);
|
| - } else {
|
| -#if defined(TOOLKIT_GTK)
|
| - // Setting the time of the last action on the window here allows us to steal
|
| - // focus, which is what the user wants when opening a new tab in an existing
|
| - // browser window.
|
| - gtk_util::SetWMLastUserActionTime(browser->window()->GetNativeHandle());
|
| -#endif
|
| - }
|
| -
|
| -#if !defined(OS_MACOSX)
|
| - // In kiosk mode, we want to always be fullscreen, so switch to that now.
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
|
| - browser->ToggleFullscreenMode();
|
| -#endif
|
| -
|
| - bool first_tab = true;
|
| - for (size_t i = 0; i < tabs.size(); ++i) {
|
| - // We skip URLs that we'd have to launch an external protocol handler for.
|
| - // This avoids us getting into an infinite loop asking ourselves to open
|
| - // a URL, should the handler be (incorrectly) configured to be us. Anyone
|
| - // asking us to open such a URL should really ask the handler directly.
|
| - bool handled_by_chrome = ProfileIOData::IsHandledURL(tabs[i].url) ||
|
| - (profile_ && profile_->GetProtocolHandlerRegistry()->IsHandledProtocol(
|
| - tabs[i].url.scheme()));
|
| - if (!process_startup && !handled_by_chrome)
|
| - continue;
|
| -
|
| - int add_types = first_tab ? TabStripModel::ADD_ACTIVE :
|
| - TabStripModel::ADD_NONE;
|
| - add_types |= TabStripModel::ADD_FORCE_INDEX;
|
| - if (tabs[i].is_pinned)
|
| - add_types |= TabStripModel::ADD_PINNED;
|
| - int index = browser->GetIndexForInsertionDuringRestore(i);
|
| -
|
| - browser::NavigateParams params(browser, tabs[i].url,
|
| - content::PAGE_TRANSITION_START_PAGE);
|
| - params.disposition = first_tab ? NEW_FOREGROUND_TAB :
|
| - NEW_BACKGROUND_TAB;
|
| - params.tabstrip_index = index;
|
| - params.tabstrip_add_types = add_types;
|
| - params.extension_app_id = tabs[i].app_id;
|
| - browser::Navigate(¶ms);
|
| -
|
| - first_tab = false;
|
| - }
|
| - if (!browser->GetSelectedWebContents()) {
|
| - // TODO: this is a work around for 110909. Figure out why it's needed.
|
| - if (!browser->tab_count())
|
| - browser->AddBlankTab(true);
|
| - else
|
| - browser->ActivateTabAt(0, false);
|
| - }
|
| -
|
| - browser->window()->Show();
|
| - // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
|
| - // focus explicitly.
|
| - browser->GetSelectedWebContents()->GetView()->SetInitialFocus();
|
| -
|
| - return browser;
|
| -}
|
| -
|
| -void StartupBrowserCreator::LaunchWithProfile::AddInfoBarsIfNecessary(
|
| - Browser* browser,
|
| - IsProcessStartup is_process_startup) {
|
| - if (!browser || !profile_ || browser->tab_count() == 0)
|
| - return;
|
| -
|
| - if (HasPendingUncleanExit(browser->profile()))
|
| - browser::ShowSessionCrashedPrompt(browser);
|
| -
|
| - // The bad flags info bar and the obsolete system info bar are only added to
|
| - // the first profile which is launched. Other profiles might be restoring the
|
| - // browsing sessions asynchronously, so we cannot add the info bars to the
|
| - // focused tabs here.
|
| - if (is_process_startup == IS_PROCESS_STARTUP) {
|
| - browser::ShowBadFlagsPrompt(browser);
|
| - browser::ShowObsoleteOSPrompt(browser);
|
| - }
|
| -}
|
| -
|
| -
|
| -void StartupBrowserCreator::LaunchWithProfile::AddStartupURLs(
|
| - std::vector<GURL>* startup_urls) const {
|
| - // If we have urls specified beforehand (i.e. from command line) use them
|
| - // and nothing else.
|
| - if (!startup_urls->empty())
|
| - return;
|
| -
|
| - // If we have urls specified by the first run master preferences use them
|
| - // and nothing else.
|
| - if (browser_creator_) {
|
| - if (!browser_creator_->first_run_tabs_.empty()) {
|
| - std::vector<GURL>::iterator it =
|
| - browser_creator_->first_run_tabs_.begin();
|
| - while (it != browser_creator_->first_run_tabs_.end()) {
|
| - // Replace magic names for the actual urls.
|
| - if (it->host() == "new_tab_page") {
|
| - startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
|
| - } else if (it->host() == "welcome_page") {
|
| - startup_urls->push_back(GetWelcomePageURL());
|
| - } else {
|
| - startup_urls->push_back(*it);
|
| - }
|
| - ++it;
|
| - }
|
| - browser_creator_->first_run_tabs_.clear();
|
| - }
|
| - }
|
| -
|
| - // Otherwise open at least the new tab page (and the welcome page, if this
|
| - // is the first time the browser is being started), or the set of URLs
|
| - // specified on the command line.
|
| - if (startup_urls->empty()) {
|
| - startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
|
| - PrefService* prefs = g_browser_process->local_state();
|
| - if (prefs->FindPreference(prefs::kShouldShowWelcomePage) &&
|
| - prefs->GetBoolean(prefs::kShouldShowWelcomePage)) {
|
| - // Reset the preference so we don't show the welcome page next time.
|
| - prefs->ClearPref(prefs::kShouldShowWelcomePage);
|
| - startup_urls->push_back(GetWelcomePageURL());
|
| - }
|
| - }
|
| -
|
| - // If the sync promo page is going to be displayed then insert it at the front
|
| - // of the list.
|
| - if (SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_)) {
|
| - SyncPromoUI::DidShowSyncPromoAtStartup(profile_);
|
| - GURL old_url = (*startup_urls)[0];
|
| - (*startup_urls)[0] =
|
| - SyncPromoUI::GetSyncPromoURL(GURL(chrome::kChromeUINewTabURL),
|
| - SyncPromoUI::SOURCE_START_PAGE);
|
| -
|
| - // An empty URL means to go to the home page.
|
| - if (old_url.is_empty() &&
|
| - profile_->GetHomePage() == GURL(chrome::kChromeUINewTabURL)) {
|
| - old_url = GURL(chrome::kChromeUINewTabURL);
|
| - }
|
| -
|
| - // If the old URL is not the NTP then insert it right after the sync promo.
|
| - if (old_url != GURL(chrome::kChromeUINewTabURL))
|
| - startup_urls->insert(startup_urls->begin() + 1, old_url);
|
| -
|
| - // If we have more than two startup tabs then skip the welcome page.
|
| - if (startup_urls->size() > 2) {
|
| - std::vector<GURL>::iterator it = std::find(
|
| - startup_urls->begin(), startup_urls->end(), GetWelcomePageURL());
|
| - if (it != startup_urls->end())
|
| - startup_urls->erase(it);
|
| - }
|
| - }
|
| -}
|
| -
|
| -void StartupBrowserCreator::LaunchWithProfile::CheckPreferencesBackup(
|
| - Profile* profile) {
|
| - ProtectorService* protector_service =
|
| - ProtectorServiceFactory::GetForProfile(profile);
|
| - ProtectedPrefsWatcher* prefs_watcher = protector_service->GetPrefsWatcher();
|
| -
|
| - // Check if backup is valid.
|
| - if (!prefs_watcher->is_backup_valid()) {
|
| - protector_service->ShowChange(protector::CreatePrefsBackupInvalidChange());
|
| - // Further checks make no sense.
|
| - return;
|
| - }
|
| -
|
| - // Check for session startup (including pinned tabs) changes.
|
| - if (SessionStartupPref::DidStartupPrefChange(profile) ||
|
| - prefs_watcher->DidPrefChange(prefs::kPinnedTabs)) {
|
| - LOG(WARNING) << "Session startup settings have changed";
|
| - SessionStartupPref new_pref = SessionStartupPref::GetStartupPref(profile);
|
| - PinnedTabCodec::Tabs new_tabs = PinnedTabCodec::ReadPinnedTabs(profile);
|
| - const base::Value* tabs_backup =
|
| - prefs_watcher->GetBackupForPref(prefs::kPinnedTabs);
|
| - protector_service->ShowChange(protector::CreateSessionStartupChange(
|
| - new_pref,
|
| - new_tabs,
|
| - SessionStartupPref::GetStartupPrefBackup(profile),
|
| - PinnedTabCodec::ReadPinnedTabs(tabs_backup)));
|
| - }
|
| -
|
| - // Check for homepage changes.
|
| - if (prefs_watcher->DidPrefChange(prefs::kHomePage) ||
|
| - prefs_watcher->DidPrefChange(prefs::kHomePageIsNewTabPage) ||
|
| - prefs_watcher->DidPrefChange(prefs::kShowHomeButton)) {
|
| - LOG(WARNING) << "Homepage has changed";
|
| - PrefService* prefs = profile->GetPrefs();
|
| - std::string backup_homepage;
|
| - bool backup_homepage_is_ntp;
|
| - bool backup_show_home_button;
|
| - if (!prefs_watcher->GetBackupForPref(prefs::kHomePage)->
|
| - GetAsString(&backup_homepage) ||
|
| - !prefs_watcher->GetBackupForPref(prefs::kHomePageIsNewTabPage)->
|
| - GetAsBoolean(&backup_homepage_is_ntp) ||
|
| - !prefs_watcher->GetBackupForPref(prefs::kShowHomeButton)->
|
| - GetAsBoolean(&backup_show_home_button)) {
|
| - NOTREACHED();
|
| - }
|
| - protector_service->ShowChange(protector::CreateHomepageChange(
|
| - // New:
|
| - prefs->GetString(prefs::kHomePage),
|
| - prefs->GetBoolean(prefs::kHomePageIsNewTabPage),
|
| - prefs->GetBoolean(prefs::kShowHomeButton),
|
| - // Backup:
|
| - backup_homepage,
|
| - backup_homepage_is_ntp,
|
| - backup_show_home_button));
|
| - }
|
| -}
|
| -
|
| std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(
|
| const CommandLine& command_line,
|
| const FilePath& cur_dir,
|
| @@ -1148,6 +316,7 @@
|
| return urls;
|
| }
|
|
|
| +// static
|
| bool StartupBrowserCreator::ProcessCmdLineImpl(
|
| const CommandLine& command_line,
|
| const FilePath& cur_dir,
|
| @@ -1294,10 +463,11 @@
|
| // If we don't want to launch a new browser window or tab (in the case
|
| // of an automation request), we are done here.
|
| if (!silent_launch) {
|
| - IsProcessStartup is_process_startup = process_startup ?
|
| - IS_PROCESS_STARTUP : IS_NOT_PROCESS_STARTUP;
|
| - IsFirstRun is_first_run = first_run::IsChromeFirstRun() ?
|
| - IS_FIRST_RUN : IS_NOT_FIRST_RUN;
|
| + browser::startup::IsProcessStartup is_process_startup = process_startup ?
|
| + browser::startup::IS_PROCESS_STARTUP :
|
| + browser::startup::IS_NOT_PROCESS_STARTUP;
|
| + browser::startup::IsFirstRun is_first_run = first_run::IsChromeFirstRun() ?
|
| + browser::startup::IS_FIRST_RUN : browser::startup::IS_NOT_FIRST_RUN;
|
| // |last_opened_profiles| will be empty in the following circumstances:
|
| // - This is the first launch. |last_used_profile| is the initial profile.
|
| // - The user exited the browser by closing all windows for all
|
| @@ -1339,7 +509,7 @@
|
| is_process_startup, is_first_run, return_code))
|
| return false;
|
| // We've launched at least one browser.
|
| - is_process_startup = StartupBrowserCreator::IS_NOT_PROCESS_STARTUP;
|
| + is_process_startup = browser::startup::IS_NOT_PROCESS_STARTUP;
|
| }
|
| }
|
| }
|
| @@ -1400,3 +570,9 @@
|
| }
|
| ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
|
| }
|
| +
|
| +bool HasPendingUncleanExit(Profile* profile) {
|
| + return !profile->DidLastSessionExitCleanly() &&
|
| + !profile_launch_observer.Get().HasBeenLaunched(profile);
|
| +}
|
| +
|
|
|