chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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/ui/app_modal_dialogs/javascript_dialog_manager.cc

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

Patch Set: rebase 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/ui/app_list/search/webstore/webstore_result.cc ('k') | chrome/browser/ui/apps/apps_metro_handler_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc

diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc

index bae364574a3230cf495c4502b96c48e1886a9587..02e981c56f3eea4e92aa6e45831530c99f74b275 100644

--- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc

+++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc

@@ -15,10 +15,10 @@

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

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

#include "chrome/common/chrome_constants.h"

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

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

#include "content/public/common/content_client.h"

#include "content/public/common/javascript_message_type.h"

-#include "grit/generated_resources.h"

#include "net/base/net_util.h"

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

« no previous file with comments | « chrome/browser/ui/app_list/search/webstore/webstore_result.cc ('k') | chrome/browser/ui/apps/apps_metro_handler_win.cc » ('j') | no next file with comments »