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

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

index 5676d0a454d5cdb95a8035696a9394e431d2f2cf..6c5deda53621b7553cd88ebf711427efade2db42 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm

@@ -14,8 +14,6 @@

#import "base/mac/scoped_nsobject.h"

#import "base/mac/sdk_forward_declarations.h"

#include "base/metrics/histogram.h"

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

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/fullscreen.h"

#include "chrome/browser/profiles/profile.h"

@@ -47,6 +45,8 @@

#include "chrome/browser/ui/tabs/tab_strip_model.h"

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

#include "chrome/common/chrome_switches.h"

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

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

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

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

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