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

Side by Side Diff: ui/views/controls/menu/menu_scroll_view_container.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Further renaming Created 6 years, 11 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 "ui/views/controls/menu/menu_scroll_view_container.h" 5 #include "ui/views/controls/menu/menu_scroll_view_container.h"
6 6
7 #include "third_party/skia/include/core/SkPaint.h" 7 #include "third_party/skia/include/core/SkPaint.h"
8 #include "third_party/skia/include/core/SkPath.h" 8 #include "third_party/skia/include/core/SkPath.h"
9 #include "ui/base/accessibility/accessible_view_state.h" 9 #include "ui/base/accessibility/accessible_view_state.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 padding = 0; 292 padding = 0;
293 } 293 }
294 #endif 294 #endif
295 295
296 int top = menu_config.menu_vertical_border_size + padding; 296 int top = menu_config.menu_vertical_border_size + padding;
297 int left = menu_config.menu_horizontal_border_size + padding; 297 int left = menu_config.menu_horizontal_border_size + padding;
298 int bottom = menu_config.menu_vertical_border_size + padding; 298 int bottom = menu_config.menu_vertical_border_size + padding;
299 int right = menu_config.menu_horizontal_border_size + padding; 299 int right = menu_config.menu_horizontal_border_size + padding;
300 300
301 if (use_border) { 301 if (use_border) {
302 set_border(views::Border::CreateBorderPainter( 302 SetBorder(views::Border::CreateBorderPainter(
303 new views::RoundRectPainter(menu_config.native_theme->GetSystemColor( 303 new views::RoundRectPainter(menu_config.native_theme->GetSystemColor(
304 ui::NativeTheme::kColorId_MenuBorderColor), 304 ui::NativeTheme::kColorId_MenuBorderColor),
305 menu_config.corner_radius), 305 menu_config.corner_radius),
306 gfx::Insets(top, left, bottom, right))); 306 gfx::Insets(top, left, bottom, right)));
307 } else { 307 } else {
308 set_border(Border::CreateEmptyBorder(top, left, bottom, right)); 308 SetBorder(Border::CreateEmptyBorder(top, left, bottom, right));
309 } 309 }
310 } 310 }
311 311
312 void MenuScrollViewContainer::CreateBubbleBorder() { 312 void MenuScrollViewContainer::CreateBubbleBorder() {
313 bubble_border_ = new BubbleBorder(arrow_, 313 bubble_border_ = new BubbleBorder(arrow_,
314 BubbleBorder::SMALL_SHADOW, 314 BubbleBorder::SMALL_SHADOW,
315 SK_ColorWHITE); 315 SK_ColorWHITE);
316 set_border(bubble_border_); 316 SetBorder(scoped_ptr<Border>(bubble_border_));
317 set_background(new BubbleBackground(bubble_border_)); 317 set_background(new BubbleBackground(bubble_border_));
318 } 318 }
319 319
320 BubbleBorder::Arrow 320 BubbleBorder::Arrow
321 MenuScrollViewContainer::BubbleBorderTypeFromAnchor( 321 MenuScrollViewContainer::BubbleBorderTypeFromAnchor(
322 MenuItemView::AnchorPosition anchor) { 322 MenuItemView::AnchorPosition anchor) {
323 switch (anchor) { 323 switch (anchor) {
324 case views::MenuItemView::BUBBLE_LEFT: 324 case views::MenuItemView::BUBBLE_LEFT:
325 return BubbleBorder::RIGHT_CENTER; 325 return BubbleBorder::RIGHT_CENTER;
326 case views::MenuItemView::BUBBLE_RIGHT: 326 case views::MenuItemView::BUBBLE_RIGHT:
327 return BubbleBorder::LEFT_CENTER; 327 return BubbleBorder::LEFT_CENTER;
328 case views::MenuItemView::BUBBLE_ABOVE: 328 case views::MenuItemView::BUBBLE_ABOVE:
329 return BubbleBorder::BOTTOM_CENTER; 329 return BubbleBorder::BOTTOM_CENTER;
330 case views::MenuItemView::BUBBLE_BELOW: 330 case views::MenuItemView::BUBBLE_BELOW:
331 return BubbleBorder::TOP_CENTER; 331 return BubbleBorder::TOP_CENTER;
332 default: 332 default:
333 return BubbleBorder::NONE; 333 return BubbleBorder::NONE;
334 } 334 }
335 } 335 }
336 336
337 } // namespace views 337 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698