| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h" | 5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "chrome/browser/profiles/profiles_state.h" | 9 #include "chrome/browser/profiles/profiles_state.h" |
| 10 #include "chrome/browser/themes/theme_properties.h" | 10 #include "chrome/browser/themes/theme_properties.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "ui/base/hit_test.h" | 28 #include "ui/base/hit_test.h" |
| 29 #include "ui/base/layout.h" | 29 #include "ui/base/layout.h" |
| 30 #include "ui/base/material_design/material_design_controller.h" | 30 #include "ui/base/material_design/material_design_controller.h" |
| 31 #include "ui/base/theme_provider.h" | 31 #include "ui/base/theme_provider.h" |
| 32 #include "ui/compositor/layer_animator.h" | 32 #include "ui/compositor/layer_animator.h" |
| 33 #include "ui/gfx/canvas.h" | 33 #include "ui/gfx/canvas.h" |
| 34 #include "ui/gfx/geometry/rect_conversions.h" | 34 #include "ui/gfx/geometry/rect_conversions.h" |
| 35 #include "ui/gfx/image/image_skia.h" | 35 #include "ui/gfx/image/image_skia.h" |
| 36 #include "ui/gfx/scoped_canvas.h" | 36 #include "ui/gfx/scoped_canvas.h" |
| 37 #include "ui/views/controls/label.h" | 37 #include "ui/views/controls/label.h" |
| 38 #include "ui/views/layout/layout_constants.h" | |
| 39 #include "ui/views/mus/desktop_window_tree_host_mus.h" | 38 #include "ui/views/mus/desktop_window_tree_host_mus.h" |
| 40 #include "ui/views/mus/window_manager_frame_values.h" | 39 #include "ui/views/mus/window_manager_frame_values.h" |
| 41 #include "ui/views/widget/widget.h" | 40 #include "ui/views/widget/widget.h" |
| 42 #include "ui/views/widget/widget_delegate.h" | 41 #include "ui/views/widget/widget_delegate.h" |
| 43 | 42 |
| 44 #if defined(OS_CHROMEOS) | 43 #if defined(OS_CHROMEOS) |
| 45 #include "ash/ash_layout_constants.h" | 44 #include "ash/ash_layout_constants.h" |
| 46 #endif | 45 #endif |
| 47 | 46 |
| 48 #if !defined(OS_CHROMEOS) | 47 #if !defined(OS_CHROMEOS) |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 // TODO: move ash_layout_constants to ash/public/cpp. | 516 // TODO: move ash_layout_constants to ash/public/cpp. |
| 518 const bool restored = !frame()->IsMaximized() && !frame()->IsFullscreen(); | 517 const bool restored = !frame()->IsMaximized() && !frame()->IsFullscreen(); |
| 519 return GetAshLayoutSize(restored | 518 return GetAshLayoutSize(restored |
| 520 ? AshLayoutSize::BROWSER_RESTORED_CAPTION_BUTTON | 519 ? AshLayoutSize::BROWSER_RESTORED_CAPTION_BUTTON |
| 521 : AshLayoutSize::BROWSER_MAXIMIZED_CAPTION_BUTTON) | 520 : AshLayoutSize::BROWSER_MAXIMIZED_CAPTION_BUTTON) |
| 522 .height(); | 521 .height(); |
| 523 #else | 522 #else |
| 524 return views::WindowManagerFrameValues::instance().normal_insets.top(); | 523 return views::WindowManagerFrameValues::instance().normal_insets.top(); |
| 525 #endif | 524 #endif |
| 526 } | 525 } |
| OLD | NEW |