| 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/ash_layout_constants.h" | 9 #include "ash/ash_layout_constants.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 26 matching lines...) Expand all Loading... |
| 37 #include "ui/aura/client/aura_constants.h" | 37 #include "ui/aura/client/aura_constants.h" |
| 38 #include "ui/aura/window.h" | 38 #include "ui/aura/window.h" |
| 39 #include "ui/base/hit_test.h" | 39 #include "ui/base/hit_test.h" |
| 40 #include "ui/base/layout.h" | 40 #include "ui/base/layout.h" |
| 41 #include "ui/base/theme_provider.h" | 41 #include "ui/base/theme_provider.h" |
| 42 #include "ui/compositor/layer_animator.h" | 42 #include "ui/compositor/layer_animator.h" |
| 43 #include "ui/gfx/canvas.h" | 43 #include "ui/gfx/canvas.h" |
| 44 #include "ui/gfx/image/image_skia.h" | 44 #include "ui/gfx/image/image_skia.h" |
| 45 #include "ui/gfx/scoped_canvas.h" | 45 #include "ui/gfx/scoped_canvas.h" |
| 46 #include "ui/views/controls/label.h" | 46 #include "ui/views/controls/label.h" |
| 47 #include "ui/views/layout/layout_constants.h" | |
| 48 #include "ui/views/widget/widget.h" | 47 #include "ui/views/widget/widget.h" |
| 49 #include "ui/views/widget/widget_delegate.h" | 48 #include "ui/views/widget/widget_delegate.h" |
| 50 | 49 |
| 51 #if defined(OS_CHROMEOS) | 50 #if defined(OS_CHROMEOS) |
| 52 #include "ash/shared/app_types.h" | 51 #include "ash/shared/app_types.h" |
| 53 #endif | 52 #endif |
| 54 | 53 |
| 55 namespace { | 54 namespace { |
| 56 | 55 |
| 57 // Space between right edge of tabstrip and maximize button. | 56 // Space between right edge of tabstrip and maximize button. |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 toolbar_bounds.width(), 0); | 451 toolbar_bounds.width(), 0); |
| 453 BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), | 452 BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), |
| 454 separator_rect, true); | 453 separator_rect, true); |
| 455 | 454 |
| 456 // Toolbar/content separator. | 455 // Toolbar/content separator. |
| 457 toolbar_bounds.Inset(kClientEdgeThickness, 0); | 456 toolbar_bounds.Inset(kClientEdgeThickness, 0); |
| 458 BrowserView::Paint1pxHorizontalLine( | 457 BrowserView::Paint1pxHorizontalLine( |
| 459 canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR), | 458 canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR), |
| 460 toolbar_bounds, true); | 459 toolbar_bounds, true); |
| 461 } | 460 } |
| OLD | NEW |