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/ash_switches.h" | 9 #include "ash/ash_switches.h" |
10 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" | 10 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/ui/views/tab_icon_view.h" | 24 #include "chrome/browser/ui/views/tab_icon_view.h" |
25 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 25 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
26 #include "chrome/common/chrome_switches.h" | 26 #include "chrome/common/chrome_switches.h" |
27 #include "content/public/browser/web_contents.h" | 27 #include "content/public/browser/web_contents.h" |
28 #include "grit/ash_resources.h" | 28 #include "grit/ash_resources.h" |
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/l10n/l10n_util.h" | |
35 #include "ui/base/layout.h" | 34 #include "ui/base/layout.h" |
36 #include "ui/base/resource/resource_bundle.h" | 35 #include "ui/base/resource/resource_bundle.h" |
37 #include "ui/base/theme_provider.h" | 36 #include "ui/base/theme_provider.h" |
38 #include "ui/compositor/layer_animator.h" | 37 #include "ui/compositor/layer_animator.h" |
39 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
40 #include "ui/gfx/image/image_skia.h" | 39 #include "ui/gfx/image/image_skia.h" |
41 #include "ui/gfx/rect_conversions.h" | 40 #include "ui/gfx/rect_conversions.h" |
42 #include "ui/views/controls/label.h" | 41 #include "ui/views/controls/label.h" |
43 #include "ui/views/layout/layout_constants.h" | 42 #include "ui/views/layout/layout_constants.h" |
44 #include "ui/views/widget/widget.h" | 43 #include "ui/views/widget/widget.h" |
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
549 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); | 548 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); |
550 } | 549 } |
551 | 550 |
552 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { | 551 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { |
553 DCHECK(!UsePackagedAppHeaderStyle()); | 552 DCHECK(!UsePackagedAppHeaderStyle()); |
554 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), | 553 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), |
555 width(), kClientEdgeThickness), | 554 width(), kClientEdgeThickness), |
556 ThemeProperties::GetDefaultColor( | 555 ThemeProperties::GetDefaultColor( |
557 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); | 556 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); |
558 } | 557 } |
OLD | NEW |