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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/frame/header_view.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash (cleaning remaining wm_window.h in c/b/ui) Created 3 years, 7 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
« ash/ash_touch_exploration_manager_chromeos.cc ('K') | « ash/frame/header_painter_util.cc ('k') | ash/high_contrast/high_contrast_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/frame/header_view.cc
diff --git a/ash/frame/header_view.cc b/ash/frame/header_view.cc
index c59c5774b4fe34a00977d05bd1801c147549afc7..f52859e108878ea5977bc1ae32cafde81af4c191 100644
--- a/ash/frame/header_view.cc
+++ b/ash/frame/header_view.cc
@@ -9,7 +9,6 @@
#include "ash/session/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/shell_port.h"
-#include "ash/wm_window.h"
#include "ui/gfx/canvas.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/widget/widget.h"
@@ -67,7 +66,7 @@ int HeaderView::GetMinimumWidth() const {
void HeaderView::UpdateAvatarIcon() {
SessionStateDelegate* delegate = ShellPort::Get()->GetSessionStateDelegate();
- WmWindow* window = WmWindow::Get(target_widget_->GetNativeWindow());
+ aura::Window* window = target_widget_->GetNativeWindow();
bool show = delegate->ShouldShowAvatar(window);
if (!show) {
if (!avatar_icon_)
« ash/ash_touch_exploration_manager_chromeos.cc ('K') | « ash/frame/header_painter_util.cc ('k') | ash/high_contrast/high_contrast_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698