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

Unified Diff: chrome/browser/automation/automation_provider_observers.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
« no previous file with comments | « no previous file | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/automation_provider_observers.cc
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index 8fa9e15ca86ab13d46f6c8ae7145d797d572282c..0fa526296ae38e8276c5468a61b3c6099fc2b537 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -35,6 +35,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/extensions/launch_util.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/history/top_sites.h"
#include "chrome/browser/infobars/confirm_infobar_delegate.h"
@@ -1768,16 +1769,13 @@ std::vector<DictionaryValue*>* GetAppInfoFromExtensions(
NOTREACHED() << "Can't get integer from key " << kLaunchType;
continue;
}
- if (launch_type == extensions::ExtensionPrefs::LAUNCH_TYPE_PINNED) {
+ if (launch_type == extensions::LAUNCH_TYPE_PINNED) {
app_info->SetString(kLaunchType, "pinned");
- } else if (launch_type ==
- extensions::ExtensionPrefs::LAUNCH_TYPE_REGULAR) {
+ } else if (launch_type == extensions::LAUNCH_TYPE_REGULAR) {
app_info->SetString(kLaunchType, "regular");
- } else if (launch_type ==
- extensions::ExtensionPrefs::LAUNCH_TYPE_FULLSCREEN) {
+ } else if (launch_type == extensions::LAUNCH_TYPE_FULLSCREEN) {
app_info->SetString(kLaunchType, "fullscreen");
- } else if (launch_type ==
- extensions::ExtensionPrefs::LAUNCH_TYPE_WINDOW) {
+ } else if (launch_type == extensions::LAUNCH_TYPE_WINDOW) {
app_info->SetString(kLaunchType, "window");
} else {
app_info->SetString(kLaunchType, "unknown");
« no previous file with comments | « no previous file | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698