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

Unified Diff: chrome/browser/ui/app_list/app_list_controller_delegate.cc

Issue 105733003: Move LaunchType out of ExtensionPrefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix indenting Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/app_list_controller_delegate.cc
diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate.cc b/chrome/browser/ui/app_list/app_list_controller_delegate.cc
index b1bdd7d39b4391f211f8b57d52390f829fc7b0b7..dc2db5f79693be917f8cf4cbe9632882878e2240 100644
--- a/chrome/browser/ui/app_list/app_list_controller_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_controller_delegate.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/install_tracker_factory.h"
+#include "chrome/browser/extensions/launch_util.h"
#include "chrome/browser/ui/app_list/extension_uninstaller.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/common/extensions/extension_constants.h"
@@ -126,23 +127,23 @@ void AppListControllerDelegate::ShowOptionsPage(
chrome::Navigate(&params);
}
-extensions::ExtensionPrefs::LaunchType
-AppListControllerDelegate::GetExtensionLaunchType(
+extensions::LaunchType AppListControllerDelegate::GetExtensionLaunchType(
Profile* profile,
const std::string& app_id) {
ExtensionService* service =
extensions::ExtensionSystem::Get(profile)->extension_service();
- return service->extension_prefs()->
- GetLaunchType(GetExtension(profile, app_id));
+ return extensions::GetLaunchType(service->extension_prefs(),
+ GetExtension(profile, app_id));
}
void AppListControllerDelegate::SetExtensionLaunchType(
Profile* profile,
const std::string& extension_id,
- extensions::ExtensionPrefs::LaunchType launch_type) {
+ extensions::LaunchType launch_type) {
ExtensionService* service =
extensions::ExtensionSystem::Get(profile)->extension_service();
- service->extension_prefs()->SetLaunchType(extension_id, launch_type);
+ extensions::SetLaunchType(
+ service->extension_prefs(), extension_id, launch_type);
}
bool AppListControllerDelegate::IsExtensionInstalled(
« no previous file with comments | « chrome/browser/ui/app_list/app_list_controller_delegate.h ('k') | chrome/browser/ui/ash/app_list/app_list_controller_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698