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

Side by Side Diff: chrome/browser/extensions/extension_service.cc

Issue 14241002: 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: Created 7 years, 8 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <set> 9 #include <set>
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "chrome/browser/themes/theme_service_factory.h" 71 #include "chrome/browser/themes/theme_service_factory.h"
72 #include "chrome/browser/ui/webui/favicon_source.h" 72 #include "chrome/browser/ui/webui/favicon_source.h"
73 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" 73 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
74 #include "chrome/browser/ui/webui/theme_source.h" 74 #include "chrome/browser/ui/webui/theme_source.h"
75 #include "chrome/common/child_process_logging.h" 75 #include "chrome/common/child_process_logging.h"
76 #include "chrome/common/chrome_notification_types.h" 76 #include "chrome/common/chrome_notification_types.h"
77 #include "chrome/common/chrome_paths.h" 77 #include "chrome/common/chrome_paths.h"
78 #include "chrome/common/chrome_switches.h" 78 #include "chrome/common/chrome_switches.h"
79 #include "chrome/common/chrome_version_info.h" 79 #include "chrome/common/chrome_version_info.h"
80 #include "chrome/common/extensions/api/plugins/plugins_handler.h" 80 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
81 #include "chrome/common/extensions/app_launcher_info.h"
81 #include "chrome/common/extensions/background_info.h" 82 #include "chrome/common/extensions/background_info.h"
82 #include "chrome/common/extensions/extension.h" 83 #include "chrome/common/extensions/extension.h"
83 #include "chrome/common/extensions/extension_file_util.h" 84 #include "chrome/common/extensions/extension_file_util.h"
84 #include "chrome/common/extensions/extension_manifest_constants.h" 85 #include "chrome/common/extensions/extension_manifest_constants.h"
85 #include "chrome/common/extensions/extension_messages.h" 86 #include "chrome/common/extensions/extension_messages.h"
86 #include "chrome/common/extensions/feature_switch.h" 87 #include "chrome/common/extensions/feature_switch.h"
87 #include "chrome/common/extensions/features/feature.h" 88 #include "chrome/common/extensions/features/feature.h"
88 #include "chrome/common/extensions/incognito_handler.h" 89 #include "chrome/common/extensions/incognito_handler.h"
89 #include "chrome/common/extensions/manifest.h" 90 #include "chrome/common/extensions/manifest.h"
90 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" 91 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 if (!Manifest::IsUnpackedLocation(extension->location())) { 839 if (!Manifest::IsUnpackedLocation(extension->location())) {
839 if (!GetFileTaskRunner()->PostTask( 840 if (!GetFileTaskRunner()->PostTask(
840 FROM_HERE, 841 FROM_HERE,
841 base::Bind( 842 base::Bind(
842 &extension_file_util::UninstallExtension, 843 &extension_file_util::UninstallExtension,
843 install_directory_, 844 install_directory_,
844 extension_id))) 845 extension_id)))
845 NOTREACHED(); 846 NOTREACHED();
846 } 847 }
847 848
848 GURL launch_web_url_origin(extension->launch_web_url()); 849 GURL launch_web_url_origin(
850 extensions::AppLauncherInfo::GetLaunchWebURL(extension));
849 launch_web_url_origin = launch_web_url_origin.GetOrigin(); 851 launch_web_url_origin = launch_web_url_origin.GetOrigin();
Devlin 2013/04/16 21:40:58 nit: why not just do GURL launch_web_url_origin(
850 bool is_storage_isolated = 852 bool is_storage_isolated =
851 extensions::AppIsolationInfo::HasIsolatedStorage(extension); 853 extensions::AppIsolationInfo::HasIsolatedStorage(extension);
852 854
853 if (is_storage_isolated) { 855 if (is_storage_isolated) {
854 BrowserContext::AsyncObliterateStoragePartition( 856 BrowserContext::AsyncObliterateStoragePartition(
855 profile_, 857 profile_,
856 GetSiteForExtensionId(extension_id), 858 GetSiteForExtensionId(extension_id),
857 base::Bind(&ExtensionService::OnNeedsToGarbageCollectIsolatedStorage, 859 base::Bind(&ExtensionService::OnNeedsToGarbageCollectIsolatedStorage,
858 AsWeakPtr())); 860 AsWeakPtr()));
859 } else { 861 } else {
(...skipping 2285 matching lines...) Expand 10 before | Expand all | Expand 10 after
3145 } 3147 }
3146 3148
3147 void ExtensionService::AddUpdateObserver(extensions::UpdateObserver* observer) { 3149 void ExtensionService::AddUpdateObserver(extensions::UpdateObserver* observer) {
3148 update_observers_.AddObserver(observer); 3150 update_observers_.AddObserver(observer);
3149 } 3151 }
3150 3152
3151 void ExtensionService::RemoveUpdateObserver( 3153 void ExtensionService::RemoveUpdateObserver(
3152 extensions::UpdateObserver* observer) { 3154 extensions::UpdateObserver* observer) {
3153 update_observers_.RemoveObserver(observer); 3155 update_observers_.RemoveObserver(observer);
3154 } 3156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698