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

Unified Diff: chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master merged in Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc
index 29e52c92f2b1a31d15757c8ca43219ea7cd0f77c..4e3e34cd8c5142ce1776289e9db0f260b7d373ef 100644
--- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc
@@ -322,12 +322,12 @@ bool ChromeLauncherController::IsOpen(ash::LauncherID id) {
id_to_item_map_[id].controller != NULL;
}
-ExtensionPrefs::LaunchType ChromeLauncherController::GetLaunchType(
+extensions::ExtensionPrefs::LaunchType ChromeLauncherController::GetLaunchType(
ash::LauncherID id) {
DCHECK(id_to_item_map_.find(id) != id_to_item_map_.end());
return profile_->GetExtensionService()->extension_prefs()->GetLaunchType(
- id_to_item_map_[id].app_id, ExtensionPrefs::LAUNCH_DEFAULT);
+ id_to_item_map_[id].app_id, extensions::ExtensionPrefs::LAUNCH_DEFAULT);
}
std::string ChromeLauncherController::GetAppID(TabContents* tab) {
@@ -389,7 +389,7 @@ void ChromeLauncherController::PinAppWithID(const std::string& app_id) {
void ChromeLauncherController::SetLaunchType(
ash::LauncherID id,
- ExtensionPrefs::LaunchType launch_type) {
+ extensions::ExtensionPrefs::LaunchType launch_type) {
if (id_to_item_map_.find(id) == id_to_item_map_.end())
return;

Powered by Google App Engine
This is Rietveld 408576698