| 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 "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/themes/theme_properties.h" | 8 #include "chrome/browser/themes/theme_properties.h" |
| 9 #include "chrome/browser/themes/theme_service_factory.h" | 9 #include "chrome/browser/themes/theme_service_factory.h" |
| 10 #include "chrome/browser/ui/layout_constants.h" | 10 #include "chrome/browser/ui/layout_constants.h" |
| (...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 canvas->FillRect(toolbar_bounds, | 575 canvas->FillRect(toolbar_bounds, |
| 576 tp->GetColor(ThemeProperties::COLOR_TOOLBAR)); | 576 tp->GetColor(ThemeProperties::COLOR_TOOLBAR)); |
| 577 } | 577 } |
| 578 | 578 |
| 579 // Top stroke. | 579 // Top stroke. |
| 580 gfx::Rect separator_rect(x, y, w, 0); | 580 gfx::Rect separator_rect(x, y, w, 0); |
| 581 gfx::ScopedCanvas scoped_canvas(canvas); | 581 gfx::ScopedCanvas scoped_canvas(canvas); |
| 582 gfx::Rect tabstrip_bounds(GetBoundsForTabStrip(browser_view()->tabstrip())); | 582 gfx::Rect tabstrip_bounds(GetBoundsForTabStrip(browser_view()->tabstrip())); |
| 583 tabstrip_bounds.set_x(GetMirroredXForRect(tabstrip_bounds)); | 583 tabstrip_bounds.set_x(GetMirroredXForRect(tabstrip_bounds)); |
| 584 canvas->sk_canvas()->clipRect(gfx::RectToSkRect(tabstrip_bounds), | 584 canvas->sk_canvas()->clipRect(gfx::RectToSkRect(tabstrip_bounds), |
| 585 kDifference_SkClipOp); | 585 SkClipOp::kDifference); |
| 586 separator_rect.set_y(tabstrip_bounds.bottom()); | 586 separator_rect.set_y(tabstrip_bounds.bottom()); |
| 587 BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), | 587 BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), |
| 588 separator_rect, true); | 588 separator_rect, true); |
| 589 | 589 |
| 590 // Toolbar/content separator. | 590 // Toolbar/content separator. |
| 591 BrowserView::Paint1pxHorizontalLine( | 591 BrowserView::Paint1pxHorizontalLine( |
| 592 canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR), | 592 canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR), |
| 593 toolbar_bounds, true); | 593 toolbar_bounds, true); |
| 594 } | 594 } |
| 595 | 595 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 gfx::Rect side(x, y, kClientEdgeThickness, h); | 666 gfx::Rect side(x, y, kClientEdgeThickness, h); |
| 667 canvas->FillRect(side, color); | 667 canvas->FillRect(side, color); |
| 668 if (draw_bottom) { | 668 if (draw_bottom) { |
| 669 canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness), | 669 canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness), |
| 670 kClientEdgeThickness), | 670 kClientEdgeThickness), |
| 671 color); | 671 color); |
| 672 } | 672 } |
| 673 side.Offset(w + kClientEdgeThickness, 0); | 673 side.Offset(w + kClientEdgeThickness, 0); |
| 674 canvas->FillRect(side, color); | 674 canvas->FillRect(side, color); |
| 675 } | 675 } |
| OLD | NEW |