ash/frame/custom_frame_view_ash.cc - Issue 2042333002: mash: Migrate SessionStateDelegate interface to wm common types

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/frame/custom_frame_view_ash.cc

Issue 2042333002: mash: Migrate SessionStateDelegate interface to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove semicolon Created 4 years, 6 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

Index: ash/frame/custom_frame_view_ash.cc

diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc

index 0a1a5644b934db6c07b7d9e6f41cf0c99d83e127..78c4c159e79b7b0417f25006659c2bcddaf45c12 100644

--- a/ash/frame/custom_frame_view_ash.cc

+++ b/ash/frame/custom_frame_view_ash.cc

@@ -12,6 +12,7 @@

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

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

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

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

#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"

#include "ash/frame/default_header_painter.h"

#include "ash/frame/frame_border_hit_test_controller.h"

@@ -249,7 +250,7 @@ int CustomFrameViewAsh::HeaderView::GetMinimumWidth() const {

void CustomFrameViewAsh::HeaderView::UpdateAvatarIcon() {

SessionStateDelegate* delegate =

Shell::GetInstance()->session_state_delegate();

- aura::Window* window = frame_->GetNativeView();

+ WmWindow* window = WmLookup::Get()->GetWindowForWidget(frame_);

bool show = delegate->ShouldShowAvatar(window);

if (!show) {

if (!avatar_icon_)

« no previous file with comments | « no previous file | ash/session/session_state_delegate.h » ('j') | no next file with comments »