chrome/browser/ui/webui/chromeos/login/network_dropdown.h - Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/login/network_dropdown.h

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

Patch Set: iwyu fixes 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/chromeos/upgrade_detector_chromeos.h ('k') | content/public/browser/geolocation_provider.h » ('j') | content/public/browser/geolocation_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.h

diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h

index 76f2949581d0a5dd56ba816cc79382ae037e6b19..aa8843152e98edfbb9deeee6953c66dae818d79e 100644

--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h

+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h

@@ -5,6 +5,8 @@

#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_

#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_

+#include <memory>

dcheng 2016/04/07 21:18:54 Usually I just add scoped_ptr.h, but this collides

#include "base/macros.h"

#include "base/timer/timer.h"

#include "chrome/browser/chromeos/status/network_menu.h"

@@ -65,7 +67,7 @@ class NetworkDropdown : public NetworkMenu::Delegate,

void RequestNetworkScan();

// The Network menu.

- scoped_ptr<NetworkMenuWebUI> network_menu_;

+ std::unique_ptr<NetworkMenuWebUI> network_menu_;

Actor* actor_;