chrome/browser/sync/test/integration/themes_helper.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

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/sync/test/integration/themes_helper.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

« no previous file with comments | « chrome/browser/sync/test/integration/sync_extension_helper.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/themes_helper.cc

diff --git a/chrome/browser/sync/test/integration/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc

index 0ff10ce25ad1c126f225227a758e4111bce0724f..28668c61986b23a88022e98c5b334159c77186a3 100644

--- a/chrome/browser/sync/test/integration/themes_helper.cc

+++ b/chrome/browser/sync/test/integration/themes_helper.cc

@@ -8,9 +8,9 @@

#include "base/string_number_conversions.h"

#include "chrome/browser/themes/theme_service.h"

#include "chrome/browser/themes/theme_service_factory.h"

-#include "chrome/common/extensions/extension.h"

#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"

#include "chrome/browser/sync/test/integration/sync_extension_helper.h"

+#include "chrome/common/extensions/manifest.h"

using sync_datatype_helper::test;

@@ -60,7 +60,7 @@ bool HasOrWillHaveCustomTheme(Profile* profile, const std::string& id) {

void UseCustomTheme(Profile* profile, int index) {

SyncExtensionHelper::GetInstance()->InstallExtension(

- profile, MakeName(index), extensions::Extension::TYPE_THEME);

+ profile, MakeName(index), extensions::Manifest::TYPE_THEME);

}

void UseDefaultTheme(Profile* profile) {