chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm - Issue 1658793002: Update chrome for new prefs location.

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/location_bar/content_setting_decoration.mm

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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:

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

index 159d07df0ec15b72dda0a653e0188b5b2aa8c491..6bd960b9914f330a9a6c1dd9b0ee70e60950ddad 100644

--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

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

#include <algorithm>

-#include "base/prefs/pref_service.h"

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

@@ -19,6 +18,7 @@

#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

#include "chrome/browser/ui/content_settings/content_setting_image_model.h"

+#include "components/prefs/pref_service.h"

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

#include "grit/theme_resources.h"

#include "net/base/net_util.h"