chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm - 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/cocoa/website_settings/website_settings_bubble_controller.mm

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/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

index 415057b5b081377ce589f862711b1f618d97e215..2b0ccfd915d21a79a97b4431e77fc1b6c1e7fe71 100644

--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

@@ -31,13 +31,13 @@

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

-#include "grit/ui_resources.h"

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"

#import "ui/base/cocoa/controls/hyperlink_button_cell.h"

#import "ui/base/cocoa/flipped_view.h"

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

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

#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"

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

namespace {