chrome/browser/ui/views/website_settings/website_settings_popup_view.cc - Issue 480693002: Use a qualified path for ui_resources.h grit includes.

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/views/website_settings/website_settings_popup_view.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (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/views/website_settings/permissions_bubble_view.cc ('k') | chrome/browser/ui/website_settings/website_settings_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

index 361bceb09ff616385ead91eb512ad2e6d0a33d99..12cd3db0da15502376620b22e3e665d26987125e 100644

--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

@@ -26,7 +26,6 @@

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

-#include "grit/ui_resources.h"

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

#include "ui/base/models/simple_menu_model.h"

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

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

#include "ui/gfx/font_list.h"

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

#include "ui/gfx/insets.h"

+#include "ui/resources/grit/ui_resources.h"

#include "ui/views/controls/button/image_button.h"

#include "ui/views/controls/button/menu_button.h"

#include "ui/views/controls/button/menu_button_listener.h"