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/opaque_browser_frame_view.h" | 5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 22 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
23 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 23 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
24 #include "chrome/grit/generated_resources.h" | 24 #include "chrome/grit/generated_resources.h" |
25 #include "components/prefs/pref_service.h" | 25 #include "components/prefs/pref_service.h" |
26 #include "components/signin/core/browser/signin_header_helper.h" | 26 #include "components/signin/core/browser/signin_header_helper.h" |
27 #include "components/signin/core/common/profile_management_switches.h" | 27 #include "components/signin/core/common/profile_management_switches.h" |
28 #include "content/public/browser/notification_service.h" | 28 #include "content/public/browser/notification_service.h" |
29 #include "content/public/browser/web_contents.h" | 29 #include "content/public/browser/web_contents.h" |
30 #include "grit/components_strings.h" | 30 #include "grit/components_strings.h" |
31 #include "grit/theme_resources.h" | 31 #include "grit/theme_resources.h" |
| 32 #include "ui/accessibility/ax_enums.h" |
32 #include "ui/accessibility/ax_view_state.h" | 33 #include "ui/accessibility/ax_view_state.h" |
33 #include "ui/base/hit_test.h" | 34 #include "ui/base/hit_test.h" |
34 #include "ui/base/l10n/l10n_util.h" | 35 #include "ui/base/l10n/l10n_util.h" |
35 #include "ui/base/material_design/material_design_controller.h" | 36 #include "ui/base/material_design/material_design_controller.h" |
36 #include "ui/base/theme_provider.h" | 37 #include "ui/base/theme_provider.h" |
37 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
38 #include "ui/gfx/font_list.h" | 39 #include "ui/gfx/font_list.h" |
39 #include "ui/gfx/geometry/rect_conversions.h" | 40 #include "ui/gfx/geometry/rect_conversions.h" |
40 #include "ui/gfx/image/image.h" | 41 #include "ui/gfx/image/image.h" |
41 #include "ui/gfx/image/image_skia.h" | 42 #include "ui/gfx/image/image_skia.h" |
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
822 gfx::Rect side(x, y, kClientEdgeThickness, h); | 823 gfx::Rect side(x, y, kClientEdgeThickness, h); |
823 canvas->FillRect(side, color); | 824 canvas->FillRect(side, color); |
824 if (draw_bottom) { | 825 if (draw_bottom) { |
825 canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness), | 826 canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness), |
826 kClientEdgeThickness), | 827 kClientEdgeThickness), |
827 color); | 828 color); |
828 } | 829 } |
829 side.Offset(w + kClientEdgeThickness, 0); | 830 side.Offset(w + kClientEdgeThickness, 0); |
830 canvas->FillRect(side, color); | 831 canvas->FillRect(side, color); |
831 } | 832 } |
OLD | NEW |