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

Side by Side Diff: ui/gfx/native_theme_aura.cc

Issue 9565021: ui/gfx: Drop unused args from PaintMenuBackgroundColor() and pass gfx::Size instead of gfx::Rect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/native_theme_aura.h ('k') | ui/gfx/native_theme_base.h » ('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/gfx/native_theme_aura.h" 5 #include "ui/gfx/native_theme_aura.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "grit/gfx_resources.h" 9 #include "grit/gfx_resources.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 case kColorId_TextfieldSelectionBackgroundFocused: 106 case kColorId_TextfieldSelectionBackgroundFocused:
107 return kTextfieldSelectionBackgroundFocused; 107 return kTextfieldSelectionBackgroundFocused;
108 case kColorId_TextfieldSelectionBackgroundUnfocused: 108 case kColorId_TextfieldSelectionBackgroundUnfocused:
109 return kTextfieldSelectionBackgroundUnfocused; 109 return kTextfieldSelectionBackgroundUnfocused;
110 110
111 default: 111 default:
112 NOTREACHED() << "Invalid color_id: " << color_id; 112 NOTREACHED() << "Invalid color_id: " << color_id;
113 break; 113 break;
114 } 114 }
115 115
116 // Return InvalidColor
117 return kInvalidColorIdColor; 116 return kInvalidColorIdColor;
118 } 117 }
119 118
120 void NativeThemeAura::PaintMenuPopupBackground( 119 void NativeThemeAura::PaintMenuPopupBackground(SkCanvas* canvas,
121 SkCanvas* canvas, 120 const gfx::Size& size) const {
122 State state,
123 const gfx::Rect& rect,
124 const MenuListExtraParams& menu_list) const {
125 canvas->drawColor(kMenuBackgroundColor, SkXfermode::kSrc_Mode); 121 canvas->drawColor(kMenuBackgroundColor, SkXfermode::kSrc_Mode);
126 } 122 }
127 123
128 void NativeThemeAura::PaintScrollbarTrack( 124 void NativeThemeAura::PaintScrollbarTrack(
129 SkCanvas* canvas, 125 SkCanvas* canvas,
130 Part part, 126 Part part,
131 State state, 127 State state,
132 const ScrollbarTrackExtraParams& extra_params, 128 const ScrollbarTrackExtraParams& extra_params,
133 const gfx::Rect& rect) const { 129 const gfx::Rect& rect) const {
134 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 130 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 SkBitmapOperations::CreateTransposedBtmap(*vertical_bitmap); 246 SkBitmapOperations::CreateTransposedBtmap(*vertical_bitmap);
251 SkBitmap* horizontal_bitmap = new SkBitmap(transposed_bitmap); 247 SkBitmap* horizontal_bitmap = new SkBitmap(transposed_bitmap);
252 248
253 horizontal_bitmaps_[resource_id] = horizontal_bitmap; 249 horizontal_bitmaps_[resource_id] = horizontal_bitmap;
254 return horizontal_bitmap; 250 return horizontal_bitmap;
255 } 251 }
256 return NULL; 252 return NULL;
257 } 253 }
258 254
259 } // namespace gfx 255 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/native_theme_aura.h ('k') | ui/gfx/native_theme_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698