chrome/browser/extensions/api/webstore_private/webstore_private_api.cc - Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into

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/extensions/api/webstore_private/webstore_private_api.cc

Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: hate Created 8 years, 1 month 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/extensions/api/web_request/web_request_api.cc ('k') | chrome/browser/extensions/convert_user_script_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

index 0957592fbe3aa6e9a3e3fefe629ec6b6cd2820bd..e9fa6b93c8c499a16f2749a32c0ae0130f7fd494 100644

--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

@@ -26,13 +26,13 @@

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/extension_constants.h"

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

#include "chrome/common/extensions/extension_l10n_util.h"

#include "chrome/common/pref_names.h"

#include "content/public/browser/gpu_data_manager.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_source.h"

#include "content/public/browser/web_contents.h"

+#include "extensions/common/error_utils.h"

#include "google_apis/gaia/gaia_constants.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

@@ -420,7 +420,7 @@ bool CompleteInstallFunction::RunImpl() {

scoped_ptr<WebstoreInstaller::Approval> approval(

g_pending_approvals.Get().PopApproval(profile(), id));

if (!approval.get()) {

- error_ = ExtensionErrorUtils::FormatErrorMessage(

+ error_ = ErrorUtils::FormatErrorMessage(

kNoPreviousBeginInstallWithManifestError, id);

return false;

}