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

Side by Side Diff: ash/common/frame/custom_frame_view_ash.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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
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/common/frame/custom_frame_view_ash.h" 5 #include "ash/common/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/common/ash_switches.h"
11 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h " 10 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h "
12 #include "ash/common/frame/frame_border_hit_test.h" 11 #include "ash/common/frame/frame_border_hit_test.h"
13 #include "ash/common/frame/header_view.h" 12 #include "ash/common/frame/header_view.h"
14 #include "ash/common/wm/window_state.h" 13 #include "ash/common/wm/window_state.h"
15 #include "ash/common/wm/window_state_delegate.h" 14 #include "ash/common/wm/window_state_delegate.h"
16 #include "ash/common/wm/window_state_observer.h" 15 #include "ash/common/wm/window_state_observer.h"
17 #include "ash/common/wm_lookup.h" 16 #include "ash/common/wm_lookup.h"
18 #include "ash/common/wm_shell.h" 17 #include "ash/common/wm_shell.h"
19 #include "ash/common/wm_window.h" 18 #include "ash/common/wm_window.h"
20 #include "ash/common/wm_window_observer.h" 19 #include "ash/common/wm_window_observer.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 FrameCaptionButtonContainerView* 348 FrameCaptionButtonContainerView*
350 CustomFrameViewAsh::GetFrameCaptionButtonContainerViewForTest() { 349 CustomFrameViewAsh::GetFrameCaptionButtonContainerViewForTest() {
351 return header_view_->caption_button_container(); 350 return header_view_->caption_button_container();
352 } 351 }
353 352
354 int CustomFrameViewAsh::NonClientTopBorderHeight() const { 353 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
355 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight(); 354 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
356 } 355 }
357 356
358 } // namespace ash 357 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/frame/caption_buttons/frame_caption_button_container_view.cc ('k') | ash/common/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698