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

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

Issue 10920017: [Sync] Generalize StringOrdinal to handle ordinal_in_parent field (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Relax tests Created 8 years, 3 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/extensions/crx_installer.h
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index 1cad3601bc61cfb936cb19036510cc23d3db9082..5c9a79e8994734b00201f21326f948d852aa9792 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -17,8 +17,8 @@
#include "chrome/browser/extensions/sandboxed_unpacker.h"
#include "chrome/browser/extensions/webstore_installer.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/string_ordinal.h"
#include "chrome/common/web_apps.h"
+#include "sync/api/string_ordinal.h"
class ExtensionService;
class SkBitmap;
@@ -161,7 +161,7 @@ class CrxInstaller
off_store_install_allow_reason_ = reason;
}
- void set_page_ordinal(const StringOrdinal& page_ordinal) {
+ void set_page_ordinal(const syncer::StringOrdinal& page_ordinal) {
page_ordinal_ = page_ordinal;
}
@@ -270,7 +270,7 @@ class CrxInstaller
scoped_refptr<const Extension> extension_;
// The ordinal of the NTP apps page |extension_| will be shown on.
- StringOrdinal page_ordinal_;
+ syncer::StringOrdinal page_ordinal_;
// A parsed copy of the unmodified original manifest, before any
// transformations like localization have taken place.
« no previous file with comments | « chrome/browser/extensions/app_sync_data_unittest.cc ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698