chrome/browser/ui/aura/active_desktop_monitor.h - Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/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: chrome/browser/ui/aura/active_desktop_monitor.h

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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

« chrome/browser/ui/android/tab_model/tab_model.h ('K') | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/autofill/account_chooser_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/aura/active_desktop_monitor.h

diff --git a/chrome/browser/ui/aura/active_desktop_monitor.h b/chrome/browser/ui/aura/active_desktop_monitor.h

index d0718c0342f9e569e1c5b6ccb558f055250d4966..bd33d604caf535f00f69b90398b254e8d8386b54 100644

--- a/chrome/browser/ui/aura/active_desktop_monitor.h

+++ b/chrome/browser/ui/aura/active_desktop_monitor.h

@@ -17,7 +17,7 @@ class ActiveDesktopMonitor : public aura::EnvObserver {

// Constructs an ActiveDesktopMonitor which initially uses |initial_desktop|

// as the |last_activated_desktop_| until a root window is activated.

explicit ActiveDesktopMonitor(chrome::HostDesktopType initial_desktop);

- virtual ~ActiveDesktopMonitor();

+ ~ActiveDesktopMonitor() override;

// Returns the host desktop type of the most-recently activated

// WindowTreeHost. This desktop type may no longer exist (e.g., the Ash

@@ -30,8 +30,8 @@ class ActiveDesktopMonitor : public aura::EnvObserver {

static bool IsDesktopWindow(aura::WindowTreeHost* host);

// aura::EnvObserver methods.

- virtual void OnWindowInitialized(aura::Window* window) override;

- virtual void OnHostActivated(aura::WindowTreeHost* host) override;

+ void OnWindowInitialized(aura::Window* window) override;

+ void OnHostActivated(aura::WindowTreeHost* host) override;

static ActiveDesktopMonitor* g_instance_;

chrome::HostDesktopType last_activated_desktop_;