chrome/browser/ui/views/website_settings/permissions_bubble_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/permissions_bubble_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/toolbar/browser_actions_container.cc ('k') | chrome/browser/ui/views/website_settings/website_settings_popup_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index fb6b22f822113694cd6c10cea3f0c0692f2aa216..2e0e7acfac6efcfec816e87c45afa2d5e1b51e6c 100644

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

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

@@ -9,13 +9,13 @@

#include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"

#include "chrome/browser/ui/website_settings/permission_bubble_request.h"

#include "grit/generated_resources.h"

-#include "grit/ui_resources.h"

#include "net/base/net_util.h"

#include "ui/accessibility/ax_view_state.h"

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

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

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

#include "ui/gfx/text_constants.h"

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

#include "ui/views/bubble/bubble_delegate.h"

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

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