chrome/browser/ui/webui/options/font_settings_handler.h - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

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/webui/options/font_settings_handler.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 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/webui/options/create_profile_handler.h ('k') | chrome/browser/ui/webui/options/font_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/font_settings_handler.h

diff --git a/chrome/browser/ui/webui/options/font_settings_handler.h b/chrome/browser/ui/webui/options/font_settings_handler.h

index 927c39bdde93351b13d654f94a7ec6844f620445..9ae924ec98120f98252c6b2369b51719e060fc08 100644

--- a/chrome/browser/ui/webui/options/font_settings_handler.h

+++ b/chrome/browser/ui/webui/options/font_settings_handler.h

@@ -5,8 +5,9 @@

#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_

#define CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_

+#include <memory>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "base/scoped_observer.h"

#include "chrome/browser/ui/webui/options/options_ui.h"

@@ -50,7 +51,7 @@ class FontSettingsHandler : public OptionsPageUIHandler,

private:

void HandleFetchFontsData(const base::ListValue* args);

- void FontsListHasLoaded(scoped_ptr<base::ListValue> list);

+ void FontsListHasLoaded(std::unique_ptr<base::ListValue> list);

void SetUpStandardFontSample();

void SetUpSerifFontSample();