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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/session/session_state_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/frame/custom_frame_view_ash.h" 5 #include "ash/frame/custom_frame_view_ash.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/aura/wm_window_aura.h" 11 #include "ash/aura/wm_window_aura.h"
12 #include "ash/common/wm/window_state.h" 12 #include "ash/common/wm/window_state.h"
13 #include "ash/common/wm/window_state_delegate.h" 13 #include "ash/common/wm/window_state_delegate.h"
14 #include "ash/common/wm/window_state_observer.h" 14 #include "ash/common/wm/window_state_observer.h"
15 #include "ash/common/wm_lookup.h"
15 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" 16 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
16 #include "ash/frame/default_header_painter.h" 17 #include "ash/frame/default_header_painter.h"
17 #include "ash/frame/frame_border_hit_test_controller.h" 18 #include "ash/frame/frame_border_hit_test_controller.h"
18 #include "ash/frame/header_painter.h" 19 #include "ash/frame/header_painter.h"
19 #include "ash/session/session_state_delegate.h" 20 #include "ash/session/session_state_delegate.h"
20 #include "ash/shell.h" 21 #include "ash/shell.h"
21 #include "ash/shell_observer.h" 22 #include "ash/shell_observer.h"
22 #include "ash/wm/immersive_fullscreen_controller.h" 23 #include "ash/wm/immersive_fullscreen_controller.h"
23 #include "ash/wm/window_state_aura.h" 24 #include "ash/wm/window_state_aura.h"
24 #include "base/command_line.h" 25 #include "base/command_line.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 return header_painter_->GetHeaderHeightForPainting(); 243 return header_painter_->GetHeaderHeightForPainting();
243 } 244 }
244 245
245 int CustomFrameViewAsh::HeaderView::GetMinimumWidth() const { 246 int CustomFrameViewAsh::HeaderView::GetMinimumWidth() const {
246 return header_painter_->GetMinimumHeaderWidth(); 247 return header_painter_->GetMinimumHeaderWidth();
247 } 248 }
248 249
249 void CustomFrameViewAsh::HeaderView::UpdateAvatarIcon() { 250 void CustomFrameViewAsh::HeaderView::UpdateAvatarIcon() {
250 SessionStateDelegate* delegate = 251 SessionStateDelegate* delegate =
251 Shell::GetInstance()->session_state_delegate(); 252 Shell::GetInstance()->session_state_delegate();
252 aura::Window* window = frame_->GetNativeView(); 253 WmWindow* window = WmLookup::Get()->GetWindowForWidget(frame_);
253 bool show = delegate->ShouldShowAvatar(window); 254 bool show = delegate->ShouldShowAvatar(window);
254 if (!show) { 255 if (!show) {
255 if (!avatar_icon_) 256 if (!avatar_icon_)
256 return; 257 return;
257 delete avatar_icon_; 258 delete avatar_icon_;
258 avatar_icon_ = NULL; 259 avatar_icon_ = NULL;
259 } else { 260 } else {
260 gfx::ImageSkia image = delegate->GetAvatarImageForWindow(window); 261 gfx::ImageSkia image = delegate->GetAvatarImageForWindow(window);
261 DCHECK_EQ(image.width(), image.height()); 262 DCHECK_EQ(image.width(), image.height());
262 if (!avatar_icon_) { 263 if (!avatar_icon_) {
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 FrameCaptionButtonContainerView* CustomFrameViewAsh:: 593 FrameCaptionButtonContainerView* CustomFrameViewAsh::
593 GetFrameCaptionButtonContainerViewForTest() { 594 GetFrameCaptionButtonContainerViewForTest() {
594 return header_view_->caption_button_container(); 595 return header_view_->caption_button_container();
595 } 596 }
596 597
597 int CustomFrameViewAsh::NonClientTopBorderHeight() const { 598 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
598 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight(); 599 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
599 } 600 }
600 601
601 } // namespace ash 602 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/session/session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698