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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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 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/common/ash_layout_constants.h" 9 #include "ash/common/ash_layout_constants.h"
10 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h " 10 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h "
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 toolbar_bounds.width(), toolbar_bounds.height()); 497 toolbar_bounds.width(), toolbar_bounds.height());
498 } else { 498 } else {
499 canvas->FillRect(toolbar_bounds, 499 canvas->FillRect(toolbar_bounds,
500 tp->GetColor(ThemeProperties::COLOR_TOOLBAR)); 500 tp->GetColor(ThemeProperties::COLOR_TOOLBAR));
501 } 501 }
502 502
503 // Top stroke. 503 // Top stroke.
504 gfx::ScopedCanvas scoped_canvas(canvas); 504 gfx::ScopedCanvas scoped_canvas(canvas);
505 gfx::Rect tabstrip_bounds(GetBoundsForTabStrip(browser_view()->tabstrip())); 505 gfx::Rect tabstrip_bounds(GetBoundsForTabStrip(browser_view()->tabstrip()));
506 tabstrip_bounds.set_x(GetMirroredXForRect(tabstrip_bounds)); 506 tabstrip_bounds.set_x(GetMirroredXForRect(tabstrip_bounds));
507 canvas->ClipRect(tabstrip_bounds, kDifference_SkClipOp); 507 canvas->ClipRect(tabstrip_bounds, SkClipOp::kDifference);
508 const gfx::Rect separator_rect(toolbar_bounds.x(), tabstrip_bounds.bottom(), 508 const gfx::Rect separator_rect(toolbar_bounds.x(), tabstrip_bounds.bottom(),
509 toolbar_bounds.width(), 0); 509 toolbar_bounds.width(), 0);
510 BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(), 510 BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(),
511 separator_rect, true); 511 separator_rect, true);
512 512
513 // Toolbar/content separator. 513 // Toolbar/content separator.
514 toolbar_bounds.Inset(kClientEdgeThickness, 0); 514 toolbar_bounds.Inset(kClientEdgeThickness, 0);
515 BrowserView::Paint1pxHorizontalLine( 515 BrowserView::Paint1pxHorizontalLine(
516 canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR), 516 canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR),
517 toolbar_bounds, true); 517 toolbar_bounds, true);
518 } 518 }
OLDNEW
« no previous file with comments | « cc/proto/skia_conversions_unittest.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698