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

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

Issue 2744463002: Add VectorIconButton functionality to ImageButton. (Closed)
Patch Set: fix cros build Created 3 years, 9 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
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/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 13 matching lines...) Expand all
24 #include "ui/base/hit_test.h" 24 #include "ui/base/hit_test.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/theme_provider.h" 26 #include "ui/base/theme_provider.h"
27 #include "ui/gfx/canvas.h" 27 #include "ui/gfx/canvas.h"
28 #include "ui/gfx/font_list.h" 28 #include "ui/gfx/font_list.h"
29 #include "ui/gfx/geometry/rect_conversions.h" 29 #include "ui/gfx/geometry/rect_conversions.h"
30 #include "ui/gfx/image/image.h" 30 #include "ui/gfx/image/image.h"
31 #include "ui/gfx/image/image_skia.h" 31 #include "ui/gfx/image/image_skia.h"
32 #include "ui/gfx/path.h" 32 #include "ui/gfx/path.h"
33 #include "ui/gfx/scoped_canvas.h" 33 #include "ui/gfx/scoped_canvas.h"
34 #include "ui/views/controls/button/image_button.h"
35 #include "ui/views/controls/label.h" 34 #include "ui/views/controls/label.h"
36 #include "ui/views/resources/grit/views_resources.h" 35 #include "ui/views/resources/grit/views_resources.h"
37 #include "ui/views/views_delegate.h" 36 #include "ui/views/views_delegate.h"
38 #include "ui/views/window/frame_background.h" 37 #include "ui/views/window/frame_background.h"
39 #include "ui/views/window/window_shape.h" 38 #include "ui/views/window/window_shape.h"
40 39
41 #if defined(OS_LINUX) 40 #if defined(OS_LINUX)
42 #include "ui/views/controls/menu/menu_runner.h" 41 #include "ui/views/controls/menu/menu_runner.h"
43 #endif 42 #endif
44 43
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 gfx::Rect side(x, y, kClientEdgeThickness, h); 663 gfx::Rect side(x, y, kClientEdgeThickness, h);
665 canvas->FillRect(side, color); 664 canvas->FillRect(side, color);
666 if (draw_bottom) { 665 if (draw_bottom) {
667 canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness), 666 canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness),
668 kClientEdgeThickness), 667 kClientEdgeThickness),
669 color); 668 color);
670 } 669 }
671 side.Offset(w + kClientEdgeThickness, 0); 670 side.Offset(w + kClientEdgeThickness, 0);
672 canvas->FillRect(side, color); 671 canvas->FillRect(side, color);
673 } 672 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698