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

Side by Side Diff: ui/views/bubble/bubble_border.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 months 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/DEPS ('k') | ui/views/bubble/bubble_frame_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/views/bubble/bubble_border.h" 5 #include "ui/views/bubble/bubble_border.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "grit/ui_resources.h"
12 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
14 #include "ui/gfx/image/image_skia.h" 13 #include "ui/gfx/image/image_skia.h"
15 #include "ui/gfx/rect.h" 14 #include "ui/gfx/rect.h"
16 #include "ui/gfx/skia_util.h" 15 #include "ui/gfx/skia_util.h"
16 #include "ui/resources/grit/ui_resources.h"
17 #include "ui/views/painter.h" 17 #include "ui/views/painter.h"
18 #include "ui/views/view.h" 18 #include "ui/views/view.h"
19 19
20 namespace views { 20 namespace views {
21 21
22 namespace internal { 22 namespace internal {
23 23
24 // A helper that combines each border image-set painter with arrows and metrics. 24 // A helper that combines each border image-set painter with arrows and metrics.
25 struct BorderImages { 25 struct BorderImages {
26 BorderImages(const int border_image_ids[], 26 BorderImages(const int border_image_ids[],
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 SkPath path; 372 SkPath path;
373 gfx::Rect bounds(view->GetLocalBounds()); 373 gfx::Rect bounds(view->GetLocalBounds());
374 bounds.Inset(border_->GetInsets()); 374 bounds.Inset(border_->GetInsets());
375 375
376 SkScalar radius = SkIntToScalar(border_->GetBorderCornerRadius()); 376 SkScalar radius = SkIntToScalar(border_->GetBorderCornerRadius());
377 path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius); 377 path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
378 canvas->DrawPath(path, paint); 378 canvas->DrawPath(path, paint);
379 } 379 }
380 380
381 } // namespace views 381 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/DEPS ('k') | ui/views/bubble/bubble_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698