chrome/browser/chromeos/display/display_configuration_observer.cc - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

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/display/display_configuration_observer.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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/accessibility/magnification_manager.cc ('k') | chrome/browser/chromeos/display/output_protection_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/display/display_configuration_observer.cc

diff --git a/chrome/browser/chromeos/display/display_configuration_observer.cc b/chrome/browser/chromeos/display/display_configuration_observer.cc

index 85b9932a9caa942378680c2a43b90c3b3fadc6d0..a3674c1074d1dd80f12242b390aa1939ee66e4b0 100644

--- a/chrome/browser/chromeos/display/display_configuration_observer.cc

+++ b/chrome/browser/chromeos/display/display_configuration_observer.cc

@@ -4,9 +4,10 @@

#include "chrome/browser/chromeos/display/display_configuration_observer.h"

+#include "ash/common/shell_delegate.h"

+#include "ash/common/wm_shell.h"

#include "ash/display/window_tree_host_manager.h"

#include "ash/shell.h"

-#include "ash/shell_delegate.h"

#include "chrome/browser/chromeos/display/display_preferences.h"

namespace chromeos {

@@ -21,7 +22,7 @@ DisplayConfigurationObserver::~DisplayConfigurationObserver() {

void DisplayConfigurationObserver::OnDisplaysInitialized() {

// Update the display pref with the initial power state.

- if (ash::Shell::GetInstance()->delegate()->IsFirstRunAfterBoot())

+ if (ash::WmShell::Get()->delegate()->IsFirstRunAfterBoot())

StoreDisplayPrefs();

}