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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.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/ash/launcher/chrome_launcher_controller_per_app_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc
index 828d54879211eba4e25c7438e1a0612fc792ae48..481363c3d3959c3469a7a1ae3739ba5ff7bec78f 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc
@@ -33,6 +33,7 @@
#include "ui/base/models/menu_model.h"
using extensions::Extension;
+using extensions::Manifest;
namespace {
const int kExpectedAppIndex = 1;
@@ -60,22 +61,22 @@ class ChromeLauncherControllerPerAppTest : public BrowserWithTestWindowTest {
CommandLine::ForCurrentProcess(), FilePath(), false);
std::string error;
- extension1_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
+ extension1_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
Extension::NO_FLAGS,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
&error);
- extension2_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
+ extension2_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
Extension::NO_FLAGS,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
&error);
// Fake gmail extension.
- extension3_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
+ extension3_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
Extension::NO_FLAGS,
gmail_app_id,
&error);
// Fake search extension.
- extension4_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
+ extension4_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
Extension::NO_FLAGS,
"coobgpohoikkiipiblmjeljniedjpjpf",
&error);

Powered by Google App Engine
This is Rietveld 408576698