chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc - Issue 1890713002: Adds WmWindow and converts WindowState to use it

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/views/apps/chrome_native_app_window_views_aura_ash.cc

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge again Created 4 years, 8 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/multi_user/user_switch_animator_chromeos.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

index d36f4ef3504aa47a8bcb843e81b35b0a0f72b8c4..4f82cf8ad66c21f1318c538a16e2ae6f48ad5bc1 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

@@ -14,6 +14,7 @@

#include "ash/wm/panels/panel_frame_view.h"

#include "ash/wm/window_properties.h"

#include "ash/wm/window_state.h"

+#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_state_delegate.h"

#include "ash/wm/window_state_observer.h"

#include "chrome/browser/ui/ash/ash_util.h"

@@ -46,12 +47,12 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,

// control.

// TODO(pkotwicz): This is a hack. Remove ASAP. http://crbug.com/319048

window_state_->AddObserver(this);

- window_state_->window()->AddObserver(this);

+ window_state_->aura_window()->AddObserver(this);

}

~NativeAppWindowStateDelegate() override {

if (window_state_) {

window_state_->RemoveObserver(this);

- window_state_->window()->RemoveObserver(this);

+ window_state_->aura_window()->RemoveObserver(this);

}

@@ -93,7 +94,7 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,

// Overridden from aura::WindowObserver:

void OnWindowDestroying(aura::Window* window) override {

window_state_->RemoveObserver(this);

- window_state_->window()->RemoveObserver(this);

+ window_state_->aura_window()->RemoveObserver(this);

window_state_ = NULL;

}