extensions/shell/browser/shell_network_controller_chromeos.h - Issue 1908953003: Convert //extensions/{common,shell} 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: extensions/shell/browser/shell_network_controller_chromeos.h

Issue 1908953003: Convert //extensions/{common,shell} 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 | « extensions/shell/browser/shell_native_app_window_aura_unittest.cc ('k') | extensions/shell/browser/shell_network_controller_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/shell/browser/shell_network_controller_chromeos.h

diff --git a/extensions/shell/browser/shell_network_controller_chromeos.h b/extensions/shell/browser/shell_network_controller_chromeos.h

index 36b73d77e29a0be51efd10536fa45b66d52b186a..6ce75af837097c55dc31259868ad7a5f536697a7 100644

--- a/extensions/shell/browser/shell_network_controller_chromeos.h

+++ b/extensions/shell/browser/shell_network_controller_chromeos.h

@@ -5,11 +5,11 @@

#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_NETWORK_CONTROLLER_CHROMEOS_H_

#define EXTENSIONS_SHELL_BROWSER_SHELL_NETWORK_CONTROLLER_CHROMEOS_H_

+#include <memory>

#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/timer/timer.h"

#include "base/values.h"

@@ -63,7 +63,7 @@ class ShellNetworkController : public chromeos::NetworkStateHandlerObserver {

// Handles a successful or failed connection attempt.

void HandleConnectionSuccess();

void HandleConnectionError(const std::string& error_name,

- scoped_ptr<base::DictionaryValue> error_data);

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

// Current status of communication with the chromeos::NetworkStateHandler.

// This is tracked to avoid sending duplicate requests before the handler has