| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_mus.h" | 5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/extensions/extension_util.h" | 10 #include "chrome/browser/extensions/extension_util.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/ui/views/frame/web_app_left_header_view_ash.h" | 21 #include "chrome/browser/ui/views/frame/web_app_left_header_view_ash.h" |
| 22 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h" | 22 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h" |
| 23 #include "chrome/browser/ui/views/tab_icon_view.h" | 23 #include "chrome/browser/ui/views/tab_icon_view.h" |
| 24 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 24 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 25 #include "chrome/browser/web_applications/web_app.h" | 25 #include "chrome/browser/web_applications/web_app.h" |
| 26 #include "components/mus/public/cpp/window.h" | 26 #include "components/mus/public/cpp/window.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/web_contents.h" | 28 #include "content/public/browser/web_contents.h" |
| 29 #include "extensions/browser/extension_registry.h" | 29 #include "extensions/browser/extension_registry.h" |
| 30 #include "grit/theme_resources.h" | 30 #include "grit/theme_resources.h" |
| 31 #include "ui/accessibility/ax_enums.h" |
| 31 #include "ui/accessibility/ax_view_state.h" | 32 #include "ui/accessibility/ax_view_state.h" |
| 32 #include "ui/aura/client/aura_constants.h" | 33 #include "ui/aura/client/aura_constants.h" |
| 33 #include "ui/aura/window.h" | 34 #include "ui/aura/window.h" |
| 34 #include "ui/base/hit_test.h" | 35 #include "ui/base/hit_test.h" |
| 35 #include "ui/base/layout.h" | 36 #include "ui/base/layout.h" |
| 36 #include "ui/base/material_design/material_design_controller.h" | 37 #include "ui/base/material_design/material_design_controller.h" |
| 37 #include "ui/base/resource/resource_bundle.h" | 38 #include "ui/base/resource/resource_bundle.h" |
| 38 #include "ui/base/theme_provider.h" | 39 #include "ui/base/theme_provider.h" |
| 39 #include "ui/compositor/layer_animator.h" | 40 #include "ui/compositor/layer_animator.h" |
| 40 #include "ui/gfx/canvas.h" | 41 #include "ui/gfx/canvas.h" |
| (...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 } | 618 } |
| 618 | 619 |
| 619 void BrowserNonClientFrameViewMus::PaintContentEdge(gfx::Canvas* canvas) { | 620 void BrowserNonClientFrameViewMus::PaintContentEdge(gfx::Canvas* canvas) { |
| 620 DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle()); | 621 DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle()); |
| 621 const int bottom = frame_values().normal_insets.bottom(); | 622 const int bottom = frame_values().normal_insets.bottom(); |
| 622 canvas->FillRect( | 623 canvas->FillRect( |
| 623 gfx::Rect(0, bottom, width(), kClientEdgeThickness), | 624 gfx::Rect(0, bottom, width(), kClientEdgeThickness), |
| 624 GetThemeProvider()->GetColor( | 625 GetThemeProvider()->GetColor( |
| 625 ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR)); | 626 ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR)); |
| 626 } | 627 } |
| OLD | NEW |