chrome/browser/extensions/api/extension_action/extension_page_actions_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/extension_action/extension_page_actions_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/extension_action/extension_actions_api.cc ('k') | chrome/browser/extensions/api/font_settings/font_settings_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc

diff --git a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc

index f6bb47eabd31ef5de1f06064f80b026da3eb8d94..e21944bb13fa76869d5faf59a7e1625e7445bc8e 100644

--- a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc

+++ b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc

@@ -17,11 +17,12 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser_list.h"

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

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

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

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

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

using content::NavigationEntry;

+using extensions::ErrorUtils;

namespace keys = extension_page_actions_api_constants;

@@ -69,7 +70,7 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {

bool result = ExtensionTabUtil::GetTabById(

tab_id, profile(), include_incognito(), NULL, NULL, &contents, NULL);

if (!result || !contents) {

- error_ = ExtensionErrorUtils::FormatErrorMessage(

+ error_ = ErrorUtils::FormatErrorMessage(

kNoTabError, base::IntToString(tab_id));

return false;

}

@@ -77,7 +78,7 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {

// Make sure the URL hasn't changed.

NavigationEntry* entry = contents->GetController().GetActiveEntry();

if (!entry || url != entry->GetURL().spec()) {

- error_ = ExtensionErrorUtils::FormatErrorMessage(kUrlNotActiveError, url);

+ error_ = ErrorUtils::FormatErrorMessage(kUrlNotActiveError, url);

return false;

}