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

Unified Diff: chrome/browser/ui/panels/panel_browsertest.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Index: chrome/browser/ui/panels/panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 85bd89c84236e529be3a52cc87a263f2791724e2..69a3486b89279754eb57f454221f03c470ab4e13 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -45,7 +45,6 @@
#include "ui/gfx/screen.h"
using content::WebContents;
-using extensions::Extension;
class PanelBrowserTest : public BasePanelBrowserTest {
public:
@@ -1438,9 +1437,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
MAYBE_NonExtensionDomainPanelsCloseOnUninstall) {
// Create a test extension.
DictionaryValue empty_value;
- scoped_refptr<Extension> extension =
+ scoped_refptr<extensions::Extension> extension =
CreateExtension(FILE_PATH_LITERAL("TestExtension"),
- Extension::INVALID, empty_value);
+ extensions::Manifest::INVALID_LOCATION, empty_value);
std::string extension_app_name =
web_app::GenerateApplicationNameFromExtensionId(extension->id());
@@ -1464,9 +1463,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
EXPECT_EQ(2, panel_manager->num_panels());
// Create another extension and a panel from that extension.
- scoped_refptr<Extension> extension_other =
+ scoped_refptr<extensions::Extension> extension_other =
CreateExtension(FILE_PATH_LITERAL("TestExtensionOther"),
- Extension::INVALID, empty_value);
+ extensions::Manifest::INVALID_LOCATION, empty_value);
std::string extension_app_name_other =
web_app::GenerateApplicationNameFromExtensionId(extension_other->id());
Panel* panel_other = CreatePanel(extension_app_name_other);
« no previous file with comments | « chrome/browser/ui/panels/base_panel_browser_test.cc ('k') | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698