| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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" |
| 11 #include "ash/frame/frame_border_hit_test_controller.h" | 11 #include "ash/frame/frame_border_hit_test_controller.h" |
| 12 #include "ash/frame/header_painter_util.h" | 12 #include "ash/frame/header_painter_util.h" |
| 13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 14 #include "base/profiler/scoped_tracker.h" | 14 #include "base/profiler/scoped_tracker.h" |
| 15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
| 16 #include "chrome/browser/extensions/extension_util.h" | 16 #include "chrome/browser/extensions/extension_util.h" |
| 17 #include "chrome/browser/profiles/profiles_state.h" | 17 #include "chrome/browser/profiles/profiles_state.h" |
| 18 #include "chrome/browser/themes/theme_properties.h" | 18 #include "chrome/browser/themes/theme_properties.h" |
| 19 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 20 #include "chrome/browser/ui/browser_commands.h" | 20 #include "chrome/browser/ui/browser_commands.h" |
| 21 #include "chrome/browser/ui/layout_constants.h" |
| 21 #include "chrome/browser/ui/views/frame/browser_frame.h" | 22 #include "chrome/browser/ui/views/frame/browser_frame.h" |
| 22 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h" | 23 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h" |
| 23 #include "chrome/browser/ui/views/frame/browser_view.h" | 24 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 24 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 25 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
| 25 #include "chrome/browser/ui/views/frame/web_app_left_header_view_ash.h" | 26 #include "chrome/browser/ui/views/frame/web_app_left_header_view_ash.h" |
| 26 #include "chrome/browser/ui/views/layout_constants.h" | |
| 27 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" | 27 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" |
| 28 #include "chrome/browser/ui/views/tab_icon_view.h" | 28 #include "chrome/browser/ui/views/tab_icon_view.h" |
| 29 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 29 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 30 #include "chrome/browser/web_applications/web_app.h" | 30 #include "chrome/browser/web_applications/web_app.h" |
| 31 #include "components/signin/core/common/profile_management_switches.h" | 31 #include "components/signin/core/common/profile_management_switches.h" |
| 32 #include "content/public/browser/web_contents.h" | 32 #include "content/public/browser/web_contents.h" |
| 33 #include "extensions/browser/extension_registry.h" | 33 #include "extensions/browser/extension_registry.h" |
| 34 #include "grit/theme_resources.h" | 34 #include "grit/theme_resources.h" |
| 35 #include "ui/accessibility/ax_view_state.h" | 35 #include "ui/accessibility/ax_view_state.h" |
| 36 #include "ui/aura/client/aura_constants.h" | 36 #include "ui/aura/client/aura_constants.h" |
| (...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 703 } | 703 } |
| 704 } | 704 } |
| 705 | 705 |
| 706 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { | 706 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) { |
| 707 DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle()); | 707 DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle()); |
| 708 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), | 708 canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(), |
| 709 width(), kClientEdgeThickness), | 709 width(), kClientEdgeThickness), |
| 710 ThemeProperties::GetDefaultColor( | 710 ThemeProperties::GetDefaultColor( |
| 711 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); | 711 ThemeProperties::COLOR_TOOLBAR_SEPARATOR)); |
| 712 } | 712 } |
| OLD | NEW |