chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc - Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow

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 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)

Patch Set: feedback Created 3 years, 11 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/shelf_browsertest.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.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 190e92ef23647b86c07bcdea20f39444a636a63d..d4397994bbdcfadeac6a7ef68bc635d0591d2ad7 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

@@ -5,7 +5,6 @@

#include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h"

#include "apps/ui/views/app_window_frame_view.h"

-#include "ash/aura/wm_window_aura.h"

#include "ash/common/ash_constants.h"

#include "ash/common/frame/custom_frame_view_ash.h"

#include "ash/common/shelf/shelf_item_types.h"

@@ -13,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_window.h"

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

#include "ash/screen_util.h"

#include "ash/shared/app_types.h"

@@ -58,13 +58,12 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,

// control.

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

window_state_->AddObserver(this);

- ash::WmWindowAura::GetAuraWindow(window_state_->window())

- ->AddObserver(this);

+ ash::WmWindow::GetAuraWindow(window_state_->window())->AddObserver(this);

}

~NativeAppWindowStateDelegate() override {

if (window_state_) {

window_state_->RemoveObserver(this);

- ash::WmWindowAura::GetAuraWindow(window_state_->window())

+ ash::WmWindow::GetAuraWindow(window_state_->window())

->RemoveObserver(this);

}

@@ -107,8 +106,7 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,

// Overridden from aura::WindowObserver:

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

window_state_->RemoveObserver(this);

- ash::WmWindowAura::GetAuraWindow(window_state_->window())

- ->RemoveObserver(this);

+ ash::WmWindow::GetAuraWindow(window_state_->window())->RemoveObserver(this);

window_state_ = NULL;

}