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

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

Issue 11190016: Do not add TabContents from packaged apps to the task manager. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 8 years, 2 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_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_browsertest.h
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index 3fd53a2ac94ee59949ebfb3e9b7a95790b1de7e8..e3c54127f8cca8456ab9fc622e49d2ce77e19071 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -51,14 +51,23 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
// InProcessBrowserTest
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
- const extensions::Extension* LoadExtension(const FilePath& path);
+ static const extensions::Extension* LoadExtension(
+ Browser* browser, NotificationObserver* observer, const FilePath& path);
+ const extensions::Extension* LoadExtension(const FilePath& path) {
+ return LoadExtension(browser(), this, path);
+ }
// Same as above, but enables the extension in incognito mode first.
const extensions::Extension* LoadExtensionIncognito(const FilePath& path);
- const extensions::Extension* LoadExtensionWithFlags(
+ static const extensions::Extension* LoadExtensionWithFlags(
+ Browser* browser, NotificationObserver* observer,
const FilePath& path, int flags);
+ const extensions::Extension* LoadExtensionWithFlags(
+ const FilePath& path, int flags) {
+ return LoadExtensionWithFlags(browser(), this, path, flags);
+ }
// Loads extension and imitates that it is a component extension.
const extensions::Extension* LoadExtensionAsComponent(const FilePath& path);
@@ -238,7 +247,11 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
Browser* browser,
bool from_webstore);
- bool WaitForExtensionViewsToLoad();
+ static bool WaitForExtensionViewsToLoad(
+ Browser* browser, NotificationObserver* observer);
+ bool WaitForExtensionViewsToLoad() {
+ return WaitForExtensionViewsToLoad(browser(), this);
+ }
// When waiting for page action count to change, we wait until it reaches this
// value.
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698