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

Side by Side Diff: chrome/browser/ui/views/toolbar/chevron_menu_button.cc

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/toolbar/chevron_menu_button.h" 5 #include "chrome/browser/ui/views/toolbar/chevron_menu_button.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 if (menu_controller_) 382 if (menu_controller_)
383 menu_controller_->CloseMenu(); 383 menu_controller_->CloseMenu();
384 } 384 }
385 385
386 scoped_ptr<views::LabelButtonBorder> ChevronMenuButton::CreateDefaultBorder() 386 scoped_ptr<views::LabelButtonBorder> ChevronMenuButton::CreateDefaultBorder()
387 const { 387 const {
388 // The chevron resource was designed to not have any insets. 388 // The chevron resource was designed to not have any insets.
389 scoped_ptr<views::LabelButtonBorder> border = 389 scoped_ptr<views::LabelButtonBorder> border =
390 views::MenuButton::CreateDefaultBorder(); 390 views::MenuButton::CreateDefaultBorder();
391 border->set_insets(gfx::Insets()); 391 border->set_insets(gfx::Insets());
392 return border.Pass(); 392 return border;
393 } 393 }
394 394
395 bool ChevronMenuButton::GetDropFormats( 395 bool ChevronMenuButton::GetDropFormats(
396 int* formats, 396 int* formats,
397 std::set<ui::Clipboard::FormatType>* format_types) { 397 std::set<ui::Clipboard::FormatType>* format_types) {
398 return BrowserActionDragData::GetDropFormats(format_types); 398 return BrowserActionDragData::GetDropFormats(format_types);
399 } 399 }
400 400
401 bool ChevronMenuButton::AreDropTypesRequired() { 401 bool ChevronMenuButton::AreDropTypesRequired() {
402 return BrowserActionDragData::AreDropTypesRequired(); 402 return BrowserActionDragData::AreDropTypesRequired();
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 // We should never try to show an overflow menu when one is already visible. 446 // We should never try to show an overflow menu when one is already visible.
447 DCHECK(!menu_controller_); 447 DCHECK(!menu_controller_);
448 menu_controller_.reset(new MenuController( 448 menu_controller_.reset(new MenuController(
449 this, browser_actions_container_, for_drop)); 449 this, browser_actions_container_, for_drop));
450 menu_controller_->RunMenu(GetWidget()); 450 menu_controller_->RunMenu(GetWidget());
451 } 451 }
452 452
453 void ChevronMenuButton::MenuDone() { 453 void ChevronMenuButton::MenuDone() {
454 menu_controller_.reset(); 454 menu_controller_.reset();
455 } 455 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/browser_actions_container.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_action_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698