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

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

Issue 777543002: Create hosted app shims on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed global static initialisers Created 6 years 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
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 "extensions/browser/api/management/management_api.h" 5 #include "extensions/browser/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"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 std::vector<management::LaunchType> GetAvailableLaunchTypes( 73 std::vector<management::LaunchType> GetAvailableLaunchTypes(
74 const Extension& extension, 74 const Extension& extension,
75 const ManagementAPIDelegate* delegate) { 75 const ManagementAPIDelegate* delegate) {
76 std::vector<management::LaunchType> launch_type_list; 76 std::vector<management::LaunchType> launch_type_list;
77 if (extension.is_platform_app()) { 77 if (extension.is_platform_app()) {
78 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_WINDOW); 78 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_WINDOW);
79 return launch_type_list; 79 return launch_type_list;
80 } 80 }
81 81
82 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_REGULAR_TAB); 82 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_REGULAR_TAB);
83
84 #if !defined(OS_MACOSX)
85 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_WINDOW); 83 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_WINDOW);
86 #endif
87 84
88 if (!delegate->IsStreamlinedHostedAppsEnabled()) { 85 if (!delegate->IsStreamlinedHostedAppsEnabled()) {
89 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_PINNED_TAB); 86 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_AS_PINNED_TAB);
90 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_FULL_SCREEN); 87 launch_type_list.push_back(management::LAUNCH_TYPE_OPEN_FULL_SCREEN);
91 } 88 }
92 return launch_type_list; 89 return launch_type_list;
93 } 90 }
94 91
95 scoped_ptr<management::ExtensionInfo> CreateExtensionInfo( 92 scoped_ptr<management::ExtensionInfo> CreateExtensionInfo(
96 const Extension& extension, 93 const Extension& extension,
(...skipping 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 ManagementAPI::GetFactoryInstance() { 888 ManagementAPI::GetFactoryInstance() {
892 return g_factory.Pointer(); 889 return g_factory.Pointer();
893 } 890 }
894 891
895 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) { 892 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) {
896 management_event_router_.reset(new ManagementEventRouter(browser_context_)); 893 management_event_router_.reset(new ManagementEventRouter(browser_context_));
897 EventRouter::Get(browser_context_)->UnregisterObserver(this); 894 EventRouter::Get(browser_context_)->UnregisterObserver(this);
898 } 895 }
899 896
900 } // namespace extensions 897 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698