ash/wm/screen_pinning_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: ash/wm/screen_pinning_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:

Index: ash/wm/screen_pinning_controller.cc

diff --git a/ash/wm/screen_pinning_controller.cc b/ash/wm/screen_pinning_controller.cc

index 72147115c0f46346d54f82c93b52f5d476d25a8f..10f55528a0b490b2a2d7287233e6ba60411774c5 100644

--- a/ash/wm/screen_pinning_controller.cc

+++ b/ash/wm/screen_pinning_controller.cc

@@ -10,11 +10,11 @@

#include "ash/common/wm/container_finder.h"

#include "ash/common/wm/window_dimmer.h"

#include "ash/common/wm/window_state.h"

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

#include "ash/common/wm_window.h"

#include "ash/common/wm_window_user_data.h"

#include "ash/display/window_tree_host_manager.h"

#include "ash/public/cpp/shell_window_ids.h"

+#include "ash/shell.h"

#include "base/auto_reset.h"

#include "base/logging.h"

#include "base/memory/ptr_util.h"

@@ -225,7 +225,7 @@ void ScreenPinningController::SetPinnedWindow(WmWindow* pinned_window) {

pinned_window_ = nullptr;

}

- WmShell::Get()->NotifyPinnedStateChanged(pinned_window);

+ Shell::GetInstance()->NotifyPinnedStateChanged(pinned_window);

}

void ScreenPinningController::OnWindowAddedToPinnedContainer(

« no previous file with comments | « ash/wm/panels/attached_panel_window_targeter.cc ('k') | ash/wm/video_detector.cc » ('j') | no next file with comments »