| Index: chrome/browser/extensions/extension_service.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_service.cc (revision 114254)
|
| +++ chrome/browser/extensions/extension_service.cc (working copy)
|
| @@ -2035,9 +2035,7 @@
|
| }
|
|
|
| void ExtensionService::OnExtensionInstalled(
|
| - const Extension* extension,
|
| - bool from_webstore,
|
| - const StringOrdinal& page_ordinal) {
|
| + const Extension* extension, bool from_webstore, int page_index) {
|
| CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| // Ensure extension is deleted unless we transfer ownership.
|
| @@ -2094,7 +2092,7 @@
|
| extension,
|
| initial_enable ? Extension::ENABLED : Extension::DISABLED,
|
| from_webstore,
|
| - page_ordinal);
|
| + page_index);
|
|
|
| // Unpacked extensions default to allowing file access, but if that has been
|
| // overridden, don't reset the value.
|
|
|
| Property changes on: chrome/browser/extensions/extension_service.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|