chrome/browser/extensions/api/tabs/tabs_api.cc - Issue 12025010: Move default_locale out of Extension class

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/tabs_api.cc

Issue 12025010: Move default_locale out of Extension class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: extension_service_unittest fixed Created 7 years, 11 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:

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

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

index da60264f2cdd3a16bd26d6b90b6ad03631791167..3f72ba940c81c30ec066015be8474524dd97a05a 100644

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

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

@@ -51,6 +51,7 @@

#include "chrome/browser/web_applications/web_app.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

+#include "chrome/common/extensions/api/i18n/default_locale_handler.h"

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

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

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

@@ -2032,7 +2033,7 @@ void ExecuteCodeInTabFunction::DidLoadFile(bool success,

data,

extension->id(),

extension->path(),

- extension->default_locale()));

+ extensions::LocaleInfo::GetDefaultLocale(extension)));

} else {

DidLoadAndLocalizeFile(success, data);

}