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

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/cocoa/website_settings/split_block_button.mm ('k') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm » ('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 2b0ccfd915d21a79a97b4431e77fc1b6c1e7fe71..0765ac5cf9409668ede2186612468e63dc4f4959 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

@@ -23,13 +23,13 @@

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

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

#include "chrome/common/url_constants.h"

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

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

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

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

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

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

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

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

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

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