chrome/browser/extensions/api/tabs/execute_code_in_tab_function.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/tabs/execute_code_in_tab_function.cc

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

Patch Set: move into extensions namespace 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/proxy/proxy_api_helpers.cc ('k') | chrome/browser/extensions/api/tabs/tabs.cc » ('j') | extensions/common/extension_error_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc

diff --git a/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc

index 9a3c0e4f1b2f2a20d347cbe6586b8eaadd61ec83..2fef68c91385cd3355515872cb9ab7e406eb3710 100644

--- a/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc

+++ b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc

@@ -11,15 +11,14 @@

#include "chrome/browser/extensions/api/tabs/tabs_constants.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_tab_util.h"

-#include "chrome/browser/extensions/tab_helper.h"

#include "chrome/browser/extensions/file_reader.h"

#include "chrome/browser/extensions/script_executor.h"

+#include "chrome/browser/extensions/tab_helper.h"

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

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

#include "chrome/common/extensions/api/tabs.h"

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

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

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

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

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

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

@@ -27,9 +26,11 @@

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

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

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

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

using content::BrowserThread;

using extensions::api::tabs::InjectDetails;

+using extensions::ErrorUtils;

using extensions::ScriptExecutor;

using extensions::UserScript;

@@ -210,10 +211,10 @@ void ExecuteCodeInTabFunction::DidLoadAndLocalizeFile(bool success,

#if defined(OS_POSIX)

// TODO(viettrungluu): bug: there's no particular reason the path should be

// UTF-8, in which case this may fail.

- error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kLoadFileError,

+ error_ = ErrorUtils::FormatErrorMessage(keys::kLoadFileError,

resource_.relative_path().value());

#elif defined(OS_WIN)

- error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kLoadFileError,

+ error_ = ErrorUtils::FormatErrorMessage(keys::kLoadFileError,

WideToUTF8(resource_.relative_path().value()));

#endif // OS_WIN

SendResponse(false);