chrome/browser/ui/toolbar/encoding_menu_controller.cc - 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/toolbar/encoding_menu_controller.cc

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/toolbar/encoding_menu_controller.cc

diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller.cc b/chrome/browser/ui/toolbar/encoding_menu_controller.cc

index ce14740078f8e7ccb8fcb11f33d8d04e349ec273..08476d107e8c49ef538e2ae86dbc7499634de1c4 100644

--- a/chrome/browser/ui/toolbar/encoding_menu_controller.cc

+++ b/chrome/browser/ui/toolbar/encoding_menu_controller.cc

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

#include "base/i18n/rtl.h"

#include "base/macros.h"

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

#include "base/strings/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/browser_process.h"

@@ -16,6 +15,7 @@

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

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

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

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

const int EncodingMenuController::kValidEncodingIds[] = {