Chromium Code Reviews| 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/extensions/application_launch.h" | 5 #include "chrome/browser/ui/extensions/application_launch.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/metrics/field_trial.h" | 8 #include "base/metrics/field_trial.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "chrome/browser/extensions/default_apps_trial.h" | 10 #include "chrome/browser/extensions/default_apps_trial.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 98 if (extension->is_platform_app()) { | 98 if (extension->is_platform_app()) { |
| 99 extensions::LaunchPlatformApp(profile, extension, command_line); | 99 extensions::LaunchPlatformApp(profile, extension, command_line); |
| 100 return NULL; | 100 return NULL; |
| 101 } | 101 } |
| 102 | 102 |
| 103 switch (container) { | 103 switch (container) { |
| 104 case extension_misc::LAUNCH_NONE: { | 104 case extension_misc::LAUNCH_NONE: { |
| 105 NOTREACHED(); | 105 NOTREACHED(); |
| 106 break; | 106 break; |
| 107 } | 107 } |
| 108 case extension_misc::LAUNCH_PANEL: { | 108 case extension_misc::LAUNCH_PANEL: |
|
stevenjb
2012/07/02 16:53:58
not: I've spoken to the apps team, and they very m
| |
| 109 bool open_panel = false; | |
| 110 #if defined(USE_ASH) | |
| 111 open_panel = CommandLine::ForCurrentProcess()->HasSwitch( | |
| 112 ash::switches::kAuraPanelManager); | |
| 113 #else | |
| 114 open_panel = CommandLine::ForCurrentProcess()->HasSwitch( | |
| 115 switches::kBrowserlessPanels); | |
| 116 #endif | |
| 117 if (open_panel) { | |
| 118 tab = OpenApplicationPanel(profile, extension, override_url); | |
|
jennb
2012/07/02 17:13:27
Can delete OpenApplicationPanel() method as well.
| |
| 119 break; | |
| 120 } | |
| 121 // else fall through to LAUNCH_WINDOW | |
| 122 } | |
| 123 case extension_misc::LAUNCH_WINDOW: | 109 case extension_misc::LAUNCH_WINDOW: |
| 124 tab = OpenApplicationWindow(profile, extension, container, | 110 tab = OpenApplicationWindow(profile, extension, container, |
| 125 override_url, NULL); | 111 override_url, NULL); |
| 126 break; | 112 break; |
| 127 case extension_misc::LAUNCH_TAB: { | 113 case extension_misc::LAUNCH_TAB: { |
| 128 tab = OpenApplicationTab(profile, extension, override_url, | 114 tab = OpenApplicationTab(profile, extension, override_url, |
| 129 disposition); | 115 disposition); |
| 130 break; | 116 break; |
| 131 } | 117 } |
| 132 default: | 118 default: |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 340 if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN && | 326 if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN && |
| 341 !browser->window()->IsFullscreen()) { | 327 !browser->window()->IsFullscreen()) { |
| 342 browser->ToggleFullscreenMode(); | 328 browser->ToggleFullscreenMode(); |
| 343 } | 329 } |
| 344 #endif | 330 #endif |
| 345 | 331 |
| 346 return contents; | 332 return contents; |
| 347 } | 333 } |
| 348 | 334 |
| 349 } // namespace application_launch | 335 } // namespace application_launch |
| OLD | NEW |