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

Side by Side Diff: chrome/browser/extensions/api/developer_private/developer_private_api.cc

Issue 12316077: Move the parsing of app.launch related keys out of Extension class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + review comments addressed Created 7 years, 9 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
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/developer_private/developer_private_api. h" 5 #include "chrome/browser/extensions/api/developer_private/developer_private_api. h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/extensions/unpacked_installer.h" 21 #include "chrome/browser/extensions/unpacked_installer.h"
22 #include "chrome/browser/extensions/updater/extension_updater.h" 22 #include "chrome/browser/extensions/updater/extension_updater.h"
23 #include "chrome/browser/platform_util.h" 23 #include "chrome/browser/platform_util.h"
24 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/ui/chrome_select_file_policy.h" 25 #include "chrome/browser/ui/chrome_select_file_policy.h"
26 #include "chrome/browser/ui/extensions/shell_window.h" 26 #include "chrome/browser/ui/extensions/shell_window.h"
27 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 27 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
28 #include "chrome/browser/view_type_utils.h" 28 #include "chrome/browser/view_type_utils.h"
29 #include "chrome/common/extensions/api/developer_private.h" 29 #include "chrome/common/extensions/api/developer_private.h"
30 #include "chrome/common/extensions/api/icons/icons_handler.h" 30 #include "chrome/common/extensions/api/icons/icons_handler.h"
31 #include "chrome/common/extensions/app_launcher_info.h"
31 #include "chrome/common/extensions/background_info.h" 32 #include "chrome/common/extensions/background_info.h"
32 #include "chrome/common/extensions/extension_icon_set.h" 33 #include "chrome/common/extensions/extension_icon_set.h"
33 #include "chrome/common/extensions/extension_resource.h" 34 #include "chrome/common/extensions/extension_resource.h"
34 #include "chrome/common/extensions/manifest_url_handler.h" 35 #include "chrome/common/extensions/manifest_url_handler.h"
35 #include "content/public/browser/browser_thread.h" 36 #include "content/public/browser/browser_thread.h"
36 #include "content/public/browser/render_process_host.h" 37 #include "content/public/browser/render_process_host.h"
37 #include "content/public/browser/render_view_host.h" 38 #include "content/public/browser/render_view_host.h"
38 #include "content/public/browser/web_contents.h" 39 #include "content/public/browser/web_contents.h"
39 #include "extensions/common/constants.h" 40 #include "extensions/common/constants.h"
40 #include "grit/chromium_strings.h" 41 #include "grit/chromium_strings.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 new std::string(ManifestURL::GetOptionsPage(&item).spec())); 181 new std::string(ManifestURL::GetOptionsPage(&item).spec()));
181 } 182 }
182 183
183 if (!ManifestURL::GetUpdateURL(&item).is_empty()) { 184 if (!ManifestURL::GetUpdateURL(&item).is_empty()) {
184 info->update_url.reset( 185 info->update_url.reset(
185 new std::string(ManifestURL::GetUpdateURL(&item).spec())); 186 new std::string(ManifestURL::GetUpdateURL(&item).spec()));
186 } 187 }
187 188
188 if (item.is_app()) { 189 if (item.is_app()) {
189 info->app_launch_url.reset(new std::string( 190 info->app_launch_url.reset(new std::string(
190 item.GetFullLaunchURL().spec())); 191 extensions::AppLauncherInfo::GetFullLaunchURL(&item).spec()));
191 } 192 }
192 193
193 info->may_disable = system->management_policy()-> 194 info->may_disable = system->management_policy()->
194 UserMayModifySettings(&item, NULL); 195 UserMayModifySettings(&item, NULL);
195 info->is_app = item.is_app(); 196 info->is_app = item.is_app();
196 info->views = GetInspectablePagesForExtension(&item, item_is_enabled); 197 info->views = GetInspectablePagesForExtension(&item, item_is_enabled);
197 198
198 return info.Pass(); 199 return info.Pass();
199 } 200 }
200 201
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 847
847 #undef SET_STRING 848 #undef SET_STRING
848 return true; 849 return true;
849 } 850 }
850 851
851 DeveloperPrivateGetStringsFunction::~DeveloperPrivateGetStringsFunction() {} 852 DeveloperPrivateGetStringsFunction::~DeveloperPrivateGetStringsFunction() {}
852 853
853 } // namespace api 854 } // namespace api
854 855
855 } // namespace extensions 856 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698