Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: ash/mus/non_client_frame_controller.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 | « ash/mus/move_event_handler.cc ('k') | ash/mus/root_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/non_client_frame_controller.cc
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
index d19ede266458ec64e37b51a915be081c04dcc8b8..3744dc09619f1f6215f75b59dee4ab967a5dabfb 100644
--- a/ash/mus/non_client_frame_controller.cc
+++ b/ash/mus/non_client_frame_controller.cc
@@ -10,11 +10,11 @@
#include <string>
#include <vector>
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/ash_constants.h"
#include "ash/common/ash_layout_constants.h"
#include "ash/common/frame/custom_frame_view_ash.h"
#include "ash/common/wm/panels/panel_frame_view.h"
+#include "ash/common/wm_window.h"
#include "ash/mus/frame/custom_frame_view_mus.h"
#include "ash/mus/frame/detached_title_area_renderer.h"
#include "ash/mus/move_event_handler.h"
@@ -121,8 +121,8 @@ class ImmersiveFullscreenControllerDelegateMus
// DCHECK is to ensure when parent changes this code is updated.
// http://crbug.com/640392.
DCHECK_EQ(frame_window_->parent(), title_area_window->parent());
- result.push_back(ash::WmWindowAura::Get(title_area_window)
- ->ConvertRectToScreen(visible_bounds));
+ result.push_back(
+ WmWindow::Get(title_area_window)->ConvertRectToScreen(visible_bounds));
return result;
}
@@ -330,7 +330,7 @@ NonClientFrameController::NonClientFrameController(
const int shadow_inset =
Shadow::GetInteriorInsetForStyle(Shadow::STYLE_ACTIVE);
- ash::WmWindowAura* wm_window = ash::WmWindowAura::Get(window_);
+ WmWindow* wm_window = WmWindow::Get(window_);
const gfx::Insets extended_hit_region =
wm_window->ShouldUseExtendedHitRegion() ? GetExtendedHitRegion()
: gfx::Insets();
@@ -394,15 +394,15 @@ base::string16 NonClientFrameController::GetWindowTitle() const {
}
bool NonClientFrameController::CanResize() const {
- return window_ && ash::WmWindowAura::Get(window_)->CanResize();
+ return window_ && WmWindow::Get(window_)->CanResize();
}
bool NonClientFrameController::CanMaximize() const {
- return window_ && ash::WmWindowAura::Get(window_)->CanMaximize();
+ return window_ && WmWindow::Get(window_)->CanMaximize();
}
bool NonClientFrameController::CanMinimize() const {
- return window_ && ash::WmWindowAura::Get(window_)->CanMinimize();
+ return window_ && WmWindow::Get(window_)->CanMinimize();
}
bool NonClientFrameController::ShouldShowWindowTitle() const {
« no previous file with comments | « ash/mus/move_event_handler.cc ('k') | ash/mus/root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698