chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2739763003: Moves maintaining ShellObservers back to Shell

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/launcher/arc_app_window_launcher_controller.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)

Patch Set: merge Created 3 years, 9 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_shell_delegate.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

index f20d0993fa9c77fda87657e9e285bac74e690031..d6bffcdd19917853d75e8643e8ff8159873f1ab3 100644

--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

@@ -264,7 +264,7 @@ ArcAppWindowLauncherController::~ArcAppWindowLauncherController() {

if (observed_profile_)

StopObserving(observed_profile_);

if (observing_shell_)

- ash::WmShell::Get()->RemoveShellObserver(this);

+ ash::Shell::GetInstance()->RemoveShellObserver(this);

}

// static

@@ -398,7 +398,7 @@ void ArcAppWindowLauncherController::AttachControllerToWindowIfNeeded(

// the layout switch information.

if (!observing_shell_) {

observing_shell_ = true;

- ash::WmShell::Get()->AddShellObserver(this);

+ ash::Shell::GetInstance()->AddShellObserver(this);

}

// Check if we have controller for this task.