chrome/browser/automation/testing_automation_provider.cc - Issue 105733003: Move LaunchType out of ExtensionPrefs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 105733003: Move LaunchType out of ExtensionPrefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add missing extension.h include for windows 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 | « chrome/browser/automation/automation_provider_observers.cc ('k') | chrome/browser/extensions/api/management/management_api.cc » ('j') | chrome/browser/ui/app_list/app_context_menu.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/automation/testing_automation_provider.cc

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc

index e5d403e0b63e41c27ca29d07979940ac83bf27ec..f3bc7fbba8d2d372e90aa83442c60bbe215fa90d 100644

--- a/chrome/browser/automation/testing_automation_provider.cc

+++ b/chrome/browser/automation/testing_automation_provider.cc

@@ -58,6 +58,7 @@

#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/extensions/extension_tab_util.h"

#include "chrome/browser/extensions/extension_util.h"

+#include "chrome/browser/extensions/launch_util.h"

#include "chrome/browser/extensions/unpacked_installer.h"

#include "chrome/browser/extensions/updater/extension_updater.h"

#include "chrome/browser/history/history_service_factory.h"

@@ -4319,22 +4320,23 @@ void TestingAutomationProvider::SetAppLaunchType(

return;

}

- extensions::ExtensionPrefs::LaunchType launch_type;

+ extensions::LaunchType launch_type;

if (launch_type_str == "pinned") {

- launch_type = extensions::ExtensionPrefs::LAUNCH_TYPE_PINNED;

+ launch_type = extensions::LAUNCH_TYPE_PINNED;

} else if (launch_type_str == "regular") {

- launch_type = extensions::ExtensionPrefs::LAUNCH_TYPE_REGULAR;

+ launch_type = extensions::LAUNCH_TYPE_REGULAR;

} else if (launch_type_str == "fullscreen") {

- launch_type = extensions::ExtensionPrefs::LAUNCH_TYPE_FULLSCREEN;

+ launch_type = extensions::LAUNCH_TYPE_FULLSCREEN;

} else if (launch_type_str == "window") {

- launch_type = extensions::ExtensionPrefs::LAUNCH_TYPE_WINDOW;

+ launch_type = extensions::LAUNCH_TYPE_WINDOW;

} else {

reply.SendError(base::StringPrintf(

"Unexpected launch type '%s'.", launch_type_str.c_str()));

return;

}

- service->extension_prefs()->SetLaunchType(extension->id(), launch_type);

+ extensions::SetLaunchType(

+ service->extension_prefs(), extension->id(), launch_type);

reply.SendSuccess(NULL);

}