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

Side by Side Diff: chrome/browser/extensions/api/management/management_api.cc

Issue 489313002: Centralize command line checks for kEnableStreamlinedHostedApps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/extensions/api/management/management_api.h" 5 #include "chrome/browser/extensions/api/management/management_api.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/json/json_writer.h" 12 #include "base/json/json_writer.h"
13 #include "base/lazy_instance.h" 13 #include "base/lazy_instance.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/memory/linked_ptr.h" 15 #include "base/memory/linked_ptr.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
21 #include "chrome/browser/extensions/api/management/management_api_constants.h" 21 #include "chrome/browser/extensions/api/management/management_api_constants.h"
22 #include "chrome/browser/extensions/extension_service.h" 22 #include "chrome/browser/extensions/extension_service.h"
23 #include "chrome/browser/extensions/extension_ui_util.h" 23 #include "chrome/browser/extensions/extension_ui_util.h"
24 #include "chrome/browser/extensions/extension_uninstall_dialog.h" 24 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
25 #include "chrome/browser/extensions/extension_util.h"
25 #include "chrome/browser/extensions/launch_util.h" 26 #include "chrome/browser/extensions/launch_util.h"
26 #include "chrome/browser/extensions/window_controller.h" 27 #include "chrome/browser/extensions/window_controller.h"
27 #include "chrome/browser/favicon/favicon_service_factory.h" 28 #include "chrome/browser/favicon/favicon_service_factory.h"
28 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/ui/browser_dialogs.h" 30 #include "chrome/browser/ui/browser_dialogs.h"
30 #include "chrome/browser/ui/browser_finder.h" 31 #include "chrome/browser/ui/browser_finder.h"
31 #include "chrome/browser/ui/browser_window.h" 32 #include "chrome/browser/ui/browser_window.h"
32 #include "chrome/browser/ui/extensions/application_launch.h" 33 #include "chrome/browser/ui/extensions/application_launch.h"
33 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 34 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
34 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" 35 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
35 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/extensions/api/management.h" 36 #include "chrome/common/extensions/api/management.h"
37 #include "chrome/common/extensions/chrome_utility_extensions_messages.h" 37 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
38 #include "chrome/common/extensions/extension_constants.h" 38 #include "chrome/common/extensions/extension_constants.h"
39 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 39 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
40 #include "chrome/common/extensions/manifest_url_handler.h" 40 #include "chrome/common/extensions/manifest_url_handler.h"
41 #include "content/public/browser/utility_process_host.h" 41 #include "content/public/browser/utility_process_host.h"
42 #include "content/public/browser/utility_process_host_client.h" 42 #include "content/public/browser/utility_process_host_client.h"
43 #include "extensions/browser/event_router.h" 43 #include "extensions/browser/event_router.h"
44 #include "extensions/browser/extension_prefs.h" 44 #include "extensions/browser/extension_prefs.h"
45 #include "extensions/browser/extension_registry.h" 45 #include "extensions/browser/extension_registry.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_WINDOW); 99 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_WINDOW);
100 return launch_type_list; 100 return launch_type_list;
101 } 101 }
102 102
103 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_REGULAR_TAB); 103 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_REGULAR_TAB);
104 104
105 #if !defined(OS_MACOSX) 105 #if !defined(OS_MACOSX)
106 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_WINDOW); 106 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_WINDOW);
107 #endif 107 #endif
108 108
109 if (!CommandLine::ForCurrentProcess()->HasSwitch( 109 if (!util::IsStreamlinedHostedAppsEnabled()) {
110 switches::kEnableStreamlinedHostedApps)) {
111 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_PINNED_TAB); 110 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_PINNED_TAB);
112 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_FULL_SCREEN); 111 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_FULL_SCREEN);
113 } 112 }
114 return launch_type_list; 113 return launch_type_list;
115 } 114 }
116 115
117 scoped_ptr<management::ExtensionInfo> CreateExtensionInfo( 116 scoped_ptr<management::ExtensionInfo> CreateExtensionInfo(
118 const Extension& extension, 117 const Extension& extension,
119 ExtensionSystem* system) { 118 ExtensionSystem* system) {
120 scoped_ptr<management::ExtensionInfo> info(new management::ExtensionInfo()); 119 scoped_ptr<management::ExtensionInfo> info(new management::ExtensionInfo());
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 ManagementAPI::GetFactoryInstance() { 1005 ManagementAPI::GetFactoryInstance() {
1007 return g_factory.Pointer(); 1006 return g_factory.Pointer();
1008 } 1007 }
1009 1008
1010 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) { 1009 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) {
1011 management_event_router_.reset(new ManagementEventRouter(browser_context_)); 1010 management_event_router_.reset(new ManagementEventRouter(browser_context_));
1012 EventRouter::Get(browser_context_)->UnregisterObserver(this); 1011 EventRouter::Get(browser_context_)->UnregisterObserver(this);
1013 } 1012 }
1014 1013
1015 } // namespace extensions 1014 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698