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

Unified Diff: chrome/browser/extensions/extension_apitest.h

Issue 9195018: Disable modal JavaScript dialogs for platform apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 8 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_apitest.h
diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h
index d24b5fc16087c8ee60f942e06f8df0757eef2bab..f59b53a1e196a74e87a8015a7beacbdf7c930c6c 100644
--- a/chrome/browser/extensions/extension_apitest.h
+++ b/chrome/browser/extensions/extension_apitest.h
@@ -114,6 +114,10 @@ class ExtensionApiTest : public ExtensionBrowserTest {
// API on the page.
bool RunPageTest(const std::string& page_url);
+ // Similar to RunExtensionTest, except used for running tests in platform app
+ // shell windows.
+ bool RunPlatformAppTest(const char* extension_name);
+
// Start the test server, and store details of its state. Those details
// will be available to javascript tests using chrome.test.getConfig().
bool StartTestServer();
@@ -129,11 +133,16 @@ class ExtensionApiTest : public ExtensionBrowserTest {
std::string message_;
private:
+ enum Flags {
+ kFlagNone = 0,
+ kFlagEnableIncognito = 1 << 0,
+ kFlagEnableFileAccess = 1 << 1,
+ kFlagLoadAsComponent = 1 << 2,
+ kFlagLaunchAppShell = 1 << 3
+ };
bool RunExtensionTestImpl(const char* extension_name,
const std::string& test_page,
- bool enable_incognito,
- bool enable_fileaccess,
- bool load_as_component);
+ int flags);
// Hold details of the test, set in C++, which can be accessed by
// javascript using chrome.test.getConfig().
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698