ui/chromeos/network/network_state_notifier.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/chromeos/network/network_state_notifier.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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

Index: ui/chromeos/network/network_state_notifier.h

diff --git a/ui/chromeos/network/network_state_notifier.h b/ui/chromeos/network/network_state_notifier.h

index 057a7aa15e0cdce7e5fffbf3119534fa88f28670..209f3e492979a2a985d97e9a1af838403cbe3819 100644

--- a/ui/chromeos/network/network_state_notifier.h

+++ b/ui/chromeos/network/network_state_notifier.h

@@ -5,12 +5,12 @@

#ifndef UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_

#define UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_

+#include <memory>

#include <set>

#include <string>

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "base/memory/weak_ptr.h"

#include "base/time/time.h"

#include "chromeos/network/network_connection_observer.h"

@@ -83,7 +83,7 @@ class UI_CHROMEOS_EXPORT NetworkStateNotifier

const std::string& error_name,

const std::string& service_path,

const std::string& shill_connect_error,

- scoped_ptr<base::DictionaryValue> shill_error_data);

+ std::unique_ptr<base::DictionaryValue> shill_error_data);

void ShowConnectErrorNotification(

const std::string& error_name,

const std::string& service_path,

« no previous file with comments | « ui/chromeos/network/network_connect.cc ('k') | ui/chromeos/network/network_state_notifier.cc » ('j') | no next file with comments »