OLD | NEW |
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 "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" | 5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" | 9 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" |
10 #include "ash/frame/default_header_painter.h" | 10 #include "ash/frame/default_header_painter.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "grit/theme_resources.h" | 29 #include "grit/theme_resources.h" |
30 #include "ui/accessibility/ax_view_state.h" | 30 #include "ui/accessibility/ax_view_state.h" |
31 #include "ui/aura/client/aura_constants.h" | 31 #include "ui/aura/client/aura_constants.h" |
32 #include "ui/aura/window.h" | 32 #include "ui/aura/window.h" |
33 #include "ui/base/hit_test.h" | 33 #include "ui/base/hit_test.h" |
34 #include "ui/base/layout.h" | 34 #include "ui/base/layout.h" |
35 #include "ui/base/resource/resource_bundle.h" | 35 #include "ui/base/resource/resource_bundle.h" |
36 #include "ui/base/theme_provider.h" | 36 #include "ui/base/theme_provider.h" |
37 #include "ui/compositor/layer_animator.h" | 37 #include "ui/compositor/layer_animator.h" |
38 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
| 39 #include "ui/gfx/geometry/rect_conversions.h" |
39 #include "ui/gfx/image/image_skia.h" | 40 #include "ui/gfx/image/image_skia.h" |
40 #include "ui/gfx/rect_conversions.h" | |
41 #include "ui/views/controls/label.h" | 41 #include "ui/views/controls/label.h" |
42 #include "ui/views/layout/layout_constants.h" | 42 #include "ui/views/layout/layout_constants.h" |
43 #include "ui/views/widget/widget.h" | 43 #include "ui/views/widget/widget.h" |
44 #include "ui/views/widget/widget_delegate.h" | 44 #include "ui/views/widget/widget_delegate.h" |
45 | 45 |
46 #if defined(ENABLE_SUPERVISED_USERS) | 46 #if defined(ENABLE_SUPERVISED_USERS) |
47 #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h" | 47 #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h" |
48 #endif | 48 #endif |
49 | 49 |
50 namespace { | 50 namespace { |
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
656 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); | 656 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); |
657 } | 657 } |
658 | 658 |
659 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { | 659 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { |
660 DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle()); | 660 DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle()); |
661 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), | 661 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), |
662 width(), kClientEdgeThickness), | 662 width(), kClientEdgeThickness), |
663 ThemeProperties::GetDefaultColor( | 663 ThemeProperties::GetDefaultColor( |
664 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); | 664 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); |
665 } | 665 } |
OLD | NEW |