chrome/browser/ui/webui/plugins_ui.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/webui/plugins_ui.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/webui/performance_monitor/performance_monitor_ui.cc ('k') | chrome/browser/ui/webui/print_preview/print_preview_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/plugins_ui.cc

diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc

index 9df069ab6784ac76cb7955046ddbd61371093f21..17dc96408fa47b29f0ce398958426f6e68b11f79 100644

--- a/chrome/browser/ui/webui/plugins_ui.cc

+++ b/chrome/browser/ui/webui/plugins_ui.cc

@@ -34,6 +34,7 @@

#include "chrome/common/chrome_paths.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

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

#include "components/pref_registry/pref_registry_syncable.h"

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

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

@@ -43,7 +44,6 @@

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

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

#include "grit/browser_resources.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

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

#include "ui/base/resource/resource_bundle.h"

@@ -141,7 +141,7 @@ base::string16 PluginTypeToString(int type) {

class PluginsDOMHandler : public WebUIMessageHandler,

public content::NotificationObserver {

public:

- explicit PluginsDOMHandler();

+ PluginsDOMHandler();

virtual ~PluginsDOMHandler() {}

// WebUIMessageHandler implementation.