chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h - Issue 856493004: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/login.

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/chromeos/login/easy_unlock/short_lived_user_context.h

Issue 856493004: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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/login/easy_unlock/easy_unlock_user_login_flow.h ('k') | chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h

diff --git a/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h b/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h

index 7e4bdabce81d4915cdc6a6ed199870f03d2692fe..a97d11068dfeaa5b679af4c2a5ee3e9c7a812855 100644

--- a/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h

+++ b/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h

@@ -27,7 +27,7 @@ class ShortLivedUserContext : public apps::AppLifetimeMonitor::Observer {

ShortLivedUserContext(const UserContext& user_context,

apps::AppLifetimeMonitor* app_lifetime_monitor,

base::TaskRunner* task_runner);

- virtual ~ShortLivedUserContext();

+ ~ShortLivedUserContext() override;

// The UserContext returned here can be NULL if its time-to-live has expired.

UserContext* user_context() { return user_context_.get(); }

@@ -36,8 +36,7 @@ class ShortLivedUserContext : public apps::AppLifetimeMonitor::Observer {

void Reset();

// apps::AppLifetimeMonitor::Observer:

- virtual void OnAppDeactivated(Profile* profile,

- const std::string& app_id) override;

+ void OnAppDeactivated(Profile* profile, const std::string& app_id) override;

scoped_ptr<UserContext> user_context_;