OLD | NEW |
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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #include "chrome/browser/debugger/devtools_window.h" | 43 #include "chrome/browser/debugger/devtools_window.h" |
44 #include "chrome/browser/download/chrome_download_manager_delegate.h" | 44 #include "chrome/browser/download/chrome_download_manager_delegate.h" |
45 #include "chrome/browser/download/download_item_model.h" | 45 #include "chrome/browser/download/download_item_model.h" |
46 #include "chrome/browser/download/download_service.h" | 46 #include "chrome/browser/download/download_service.h" |
47 #include "chrome/browser/download/download_service_factory.h" | 47 #include "chrome/browser/download/download_service_factory.h" |
48 #include "chrome/browser/download/download_started_animation.h" | 48 #include "chrome/browser/download/download_started_animation.h" |
49 #include "chrome/browser/download/download_util.h" | 49 #include "chrome/browser/download/download_util.h" |
50 #include "chrome/browser/extensions/browser_extension_window_controller.h" | 50 #include "chrome/browser/extensions/browser_extension_window_controller.h" |
51 #include "chrome/browser/extensions/crx_installer.h" | 51 #include "chrome/browser/extensions/crx_installer.h" |
52 #include "chrome/browser/extensions/default_apps_trial.h" | 52 #include "chrome/browser/extensions/default_apps_trial.h" |
53 #include "chrome/browser/extensions/extension_browser_event_router.h" | 53 #include "chrome/browser/extensions/api/app/app_api.h" |
54 #include "chrome/browser/extensions/extension_prefs.h" | 54 #include "chrome/browser/extensions/extension_prefs.h" |
55 #include "chrome/browser/extensions/extension_service.h" | 55 #include "chrome/browser/extensions/extension_service.h" |
56 #include "chrome/browser/extensions/extension_tab_helper.h" | 56 #include "chrome/browser/extensions/extension_tab_helper.h" |
57 #include "chrome/browser/extensions/extension_tabs_module.h" | 57 #include "chrome/browser/extensions/extension_tabs_module.h" |
58 #include "chrome/browser/favicon/favicon_tab_helper.h" | 58 #include "chrome/browser/favicon/favicon_tab_helper.h" |
59 #include "chrome/browser/file_select_helper.h" | 59 #include "chrome/browser/file_select_helper.h" |
60 #include "chrome/browser/first_run/first_run.h" | 60 #include "chrome/browser/first_run/first_run.h" |
61 #include "chrome/browser/google/google_url_tracker.h" | 61 #include "chrome/browser/google/google_url_tracker.h" |
62 #include "chrome/browser/infobars/infobar_tab_helper.h" | 62 #include "chrome/browser/infobars/infobar_tab_helper.h" |
63 #include "chrome/browser/instant/instant_controller.h" | 63 #include "chrome/browser/instant/instant_controller.h" |
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
706 const Extension* extension, | 706 const Extension* extension, |
707 extension_misc::LaunchContainer container, | 707 extension_misc::LaunchContainer container, |
708 const GURL& override_url, | 708 const GURL& override_url, |
709 WindowOpenDisposition disposition) { | 709 WindowOpenDisposition disposition) { |
710 WebContents* tab = NULL; | 710 WebContents* tab = NULL; |
711 ExtensionPrefs* prefs = profile->GetExtensionService()->extension_prefs(); | 711 ExtensionPrefs* prefs = profile->GetExtensionService()->extension_prefs(); |
712 prefs->SetActiveBit(extension->id(), true); | 712 prefs->SetActiveBit(extension->id(), true); |
713 | 713 |
714 UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100); | 714 UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100); |
715 | 715 |
| 716 if (extension->is_platform_app()) { |
| 717 extensions::AppEventRouter::DispatchOnLaunchedEvent(profile, extension); |
| 718 return NULL; |
| 719 } |
| 720 |
716 switch (container) { | 721 switch (container) { |
717 case extension_misc::LAUNCH_SHELL: { | 722 case extension_misc::LAUNCH_NONE: { |
718 ShellWindow* shell_window = ShellWindow::Create( | 723 NOTREACHED(); |
719 profile, | |
720 extension, | |
721 UrlForExtension(extension, override_url)); | |
722 if (shell_window) | |
723 tab = shell_window->web_contents(); | |
724 break; | 724 break; |
725 } | 725 } |
726 case extension_misc::LAUNCH_PANEL: | 726 case extension_misc::LAUNCH_PANEL: |
727 #if defined(USE_ASH) | 727 #if defined(USE_ASH) |
728 if (extension && | 728 if (extension && |
729 CommandLine::ForCurrentProcess()->HasSwitch( | 729 CommandLine::ForCurrentProcess()->HasSwitch( |
730 ash::switches::kAuraPanelManager)) { | 730 ash::switches::kAuraPanelManager)) { |
731 tab = OpenApplicationPanel(profile, extension, override_url); | 731 tab = OpenApplicationPanel(profile, extension, override_url); |
732 break; | 732 break; |
733 } | 733 } |
(...skipping 4953 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5687 ShowSingletonTabOverwritingNTP(params); | 5687 ShowSingletonTabOverwritingNTP(params); |
5688 } else { | 5688 } else { |
5689 LoginUIServiceFactory::GetForProfile( | 5689 LoginUIServiceFactory::GetForProfile( |
5690 profile()->GetOriginalProfile())->ShowLoginUI(false); | 5690 profile()->GetOriginalProfile())->ShowLoginUI(false); |
5691 } | 5691 } |
5692 } | 5692 } |
5693 | 5693 |
5694 void Browser::ToggleSpeechInput() { | 5694 void Browser::ToggleSpeechInput() { |
5695 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); | 5695 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); |
5696 } | 5696 } |
OLD | NEW |