chrome/browser/extensions/extension_disabled_ui.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_creator.cc ('k') | chrome/browser/extensions/extension_error_ui.cc » ('j') | chrome/browser/password_manager/password_manager_util_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_disabled_ui.cc

diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc

index c1ce05b3905be605d8c8bbe2044a3ddbefcc363a..c6e87f401d6f5e262c82f70e93690ea77a720d1f 100644

--- a/chrome/browser/extensions/extension_disabled_ui.cc

+++ b/chrome/browser/extensions/extension_disabled_ui.cc

@@ -28,6 +28,8 @@

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

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

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

+#include "chrome/grit/chromium_strings.h"

+#include "chrome/grit/generated_resources.h"

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

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

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

@@ -43,8 +45,6 @@

#include "extensions/common/permissions/permission_message_provider.h"

#include "extensions/common/permissions/permission_set.h"

#include "extensions/common/permissions/permissions_data.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/gfx/image/image.h"