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 "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" | 8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" |
9 #include "ash/frame/default_header_painter.h" | 9 #include "ash/frame/default_header_painter.h" |
10 #include "ash/frame/frame_border_hit_test_controller.h" | 10 #include "ash/frame/frame_border_hit_test_controller.h" |
11 #include "ash/frame/header_painter_util.h" | 11 #include "ash/frame/header_painter_util.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "chrome/browser/themes/theme_properties.h" | 14 #include "chrome/browser/themes/theme_properties.h" |
15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/ui/views/avatar_label.h" | |
17 #include "chrome/browser/ui/views/avatar_menu_button.h" | |
18 #include "chrome/browser/ui/views/frame/browser_frame.h" | 16 #include "chrome/browser/ui/views/frame/browser_frame.h" |
19 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h" | 17 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h" |
20 #include "chrome/browser/ui/views/frame/browser_view.h" | 18 #include "chrome/browser/ui/views/frame/browser_view.h" |
21 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 19 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
| 20 #include "chrome/browser/ui/views/profiles/avatar_label.h" |
| 21 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" |
22 #include "chrome/browser/ui/views/tab_icon_view.h" | 22 #include "chrome/browser/ui/views/tab_icon_view.h" |
23 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 23 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
24 #include "chrome/common/chrome_switches.h" | 24 #include "chrome/common/chrome_switches.h" |
25 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
26 #include "grit/ash_resources.h" | 26 #include "grit/ash_resources.h" |
27 #include "grit/theme_resources.h" | 27 #include "grit/theme_resources.h" |
28 #include "ui/accessibility/ax_view_state.h" | 28 #include "ui/accessibility/ax_view_state.h" |
29 #include "ui/aura/client/aura_constants.h" | 29 #include "ui/aura/client/aura_constants.h" |
30 #include "ui/aura/window.h" | 30 #include "ui/aura/window.h" |
31 #include "ui/base/hit_test.h" | 31 #include "ui/base/hit_test.h" |
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); | 533 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); |
534 } | 534 } |
535 | 535 |
536 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { | 536 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { |
537 DCHECK(!UsePackagedAppHeaderStyle()); | 537 DCHECK(!UsePackagedAppHeaderStyle()); |
538 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), | 538 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), |
539 width(), kClientEdgeThickness), | 539 width(), kClientEdgeThickness), |
540 ThemeProperties::GetDefaultColor( | 540 ThemeProperties::GetDefaultColor( |
541 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); | 541 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); |
542 } | 542 } |
OLD | NEW |