Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Side by Side Diff: chrome/browser/ui/views/frame/glass_browser_frame_view.cc

Issue 2575533002: SkClipOp is an enum class now (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/glass_browser_frame_view.h" 5 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 canvas->FillRect(toolbar_bounds, 646 canvas->FillRect(toolbar_bounds,
647 tp->GetColor(ThemeProperties::COLOR_TOOLBAR)); 647 tp->GetColor(ThemeProperties::COLOR_TOOLBAR));
648 } 648 }
649 649
650 // Top stroke. 650 // Top stroke.
651 gfx::Rect separator_rect(x, y, w, 0); 651 gfx::Rect separator_rect(x, y, w, 0);
652 gfx::ScopedCanvas scoped_canvas(canvas); 652 gfx::ScopedCanvas scoped_canvas(canvas);
653 gfx::Rect tabstrip_bounds(GetBoundsForTabStrip(browser_view()->tabstrip())); 653 gfx::Rect tabstrip_bounds(GetBoundsForTabStrip(browser_view()->tabstrip()));
654 tabstrip_bounds.set_x(GetMirroredXForRect(tabstrip_bounds)); 654 tabstrip_bounds.set_x(GetMirroredXForRect(tabstrip_bounds));
655 canvas->sk_canvas()->clipRect(gfx::RectToSkRect(tabstrip_bounds), 655 canvas->sk_canvas()->clipRect(gfx::RectToSkRect(tabstrip_bounds),
656 kDifference_SkClipOp); 656 SkClipOp::kDifference);
657 separator_rect.set_y(tabstrip_bounds.bottom()); 657 separator_rect.set_y(tabstrip_bounds.bottom());
658 BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), 658 BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(),
659 separator_rect, true); 659 separator_rect, true);
660 660
661 // Toolbar/content separator. 661 // Toolbar/content separator.
662 BrowserView::Paint1pxHorizontalLine( 662 BrowserView::Paint1pxHorizontalLine(
663 canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR), 663 canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR),
664 toolbar_bounds, true); 664 toolbar_bounds, true);
665 } 665 }
666 666
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 static bool initialized = false; 909 static bool initialized = false;
910 if (!initialized) { 910 if (!initialized) {
911 for (int i = 0; i < kThrobberIconCount; ++i) { 911 for (int i = 0; i < kThrobberIconCount; ++i) {
912 throbber_icons_[i] = 912 throbber_icons_[i] =
913 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); 913 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
914 DCHECK(throbber_icons_[i]); 914 DCHECK(throbber_icons_[i]);
915 } 915 }
916 initialized = true; 916 initialized = true;
917 } 917 }
918 } 918 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698