chrome/browser/ui/ash/chrome_shell_delegate.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/ash/chrome_shell_delegate.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/ash/chrome_screenshot_grabber_unittest.cc ('k') | chrome/browser/ui/ash/keyboard_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_shell_delegate.h

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h

index 504a953f5e967e368490867a0a17206dd7816153..eafce5b7a83f3afb8af6b57749d5821db89f1d58 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.h

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h

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

#ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

#define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

+#include <memory>

#include <string>

#include "ash/shell_delegate.h"

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "base/observer_list.h"

#include "build/build_config.h"

#include "chrome/browser/ui/ash/metrics/chrome_user_metrics_recorder.h"

@@ -85,10 +85,10 @@ class ChromeShellDelegate : public ash::ShellDelegate,

keyboard_state_observer_list_;

// Proxies events from chrome/browser to ash::UserMetricsRecorder.

- scoped_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_;

+ std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_;

#if defined(OS_CHROMEOS)

- scoped_ptr<chromeos::DisplayConfigurationObserver>

+ std::unique_ptr<chromeos::DisplayConfigurationObserver>

display_configuration_observer_;

#endif