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

Side by Side Diff: chrome/browser/ui/views/detachable_toolbar_view.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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
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/detachable_toolbar_view.h" 5 #include "chrome/browser/ui/views/detachable_toolbar_view.h"
6 6
7 #include "chrome/browser/themes/theme_service.h" 7 #include "chrome/browser/themes/theme_service.h"
8 #include "grit/theme_resources.h" 8 #include "grit/theme_resources.h"
9 #include "grit/theme_resources_standard.h"
10 #include "third_party/skia/include/core/SkShader.h" 9 #include "third_party/skia/include/core/SkShader.h"
11 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/canvas.h" 11 #include "ui/gfx/canvas.h"
13 #include "ui/gfx/image/image_skia.h" 12 #include "ui/gfx/image/image_skia.h"
14 #include "ui/gfx/skia_util.h" 13 #include "ui/gfx/skia_util.h"
15 #include "ui/views/window/non_client_view.h" 14 #include "ui/views/window/non_client_view.h"
16 15
17 // How round the 'new tab' style bookmarks bar is. 16 // How round the 'new tab' style bookmarks bar is.
18 static const int kNewtabBarRoundness = 5; 17 static const int kNewtabBarRoundness = 5;
19 18
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // Draw the lower half of the divider. 127 // Draw the lower half of the divider.
129 SkPaint paint_down; 128 SkPaint paint_down;
130 SkSafeUnref(paint_down.setShader(gfx::CreateGradientShader( 129 SkSafeUnref(paint_down.setShader(gfx::CreateGradientShader(
131 height / 2, height - vertical_padding, middle_color, bottom_color))); 130 height / 2, height - vertical_padding, middle_color, bottom_color)));
132 SkRect rc_down = { SkIntToScalar(x), 131 SkRect rc_down = { SkIntToScalar(x),
133 SkIntToScalar(height / 2), 132 SkIntToScalar(height / 2),
134 SkIntToScalar(x + 1), 133 SkIntToScalar(x + 1),
135 SkIntToScalar(height - vertical_padding) }; 134 SkIntToScalar(height - vertical_padding) };
136 canvas->sk_canvas()->drawRect(rc_down, paint_down); 135 canvas->sk_canvas()->drawRect(rc_down, paint_down);
137 } 136 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/critical_notification_bubble_view.cc ('k') | chrome/browser/ui/views/download/download_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698