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

Unified Diff: ash/wm/workspace/frame_maximize_button.cc

Issue 14297013: Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_cycle_controller.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/frame_maximize_button.cc
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc
index a6262f9bf5421692bec0c9ad14a4b3ac24a1b132..6845365483d5b20140a4ca8b10ae4e1924bb9b52 100644
--- a/ash/wm/workspace/frame_maximize_button.cc
+++ b/ash/wm/workspace/frame_maximize_button.cc
@@ -104,7 +104,7 @@ FrameMaximizeButton::~FrameMaximizeButton() {
void FrameMaximizeButton::SnapButtonHovered(SnapType type) {
// Make sure to only show hover operations when no button is pressed and
// a similar snap operation in progress does not get re-applied.
- if (is_snap_enabled_ || (type == snap_type_ && snap_sizer_.get()))
+ if (is_snap_enabled_ || (type == snap_type_ && snap_sizer_))
return;
// Prime the mouse location with the center of the (local) button.
press_location_ = gfx::Point(width() / 2, height() / 2);
@@ -187,7 +187,7 @@ void FrameMaximizeButton::OnWindowDestroying(aura::Window* window) {
void FrameMaximizeButton::OnWidgetActivationChanged(views::Widget* widget,
bool active) {
// Upon losing focus, the control bubble should hide.
- if (!active && maximizer_.get())
+ if (!active && maximizer_)
maximizer_.reset();
}
@@ -207,7 +207,7 @@ bool FrameMaximizeButton::OnMousePressed(const ui::MouseEvent& event) {
void FrameMaximizeButton::OnMouseEntered(const ui::MouseEvent& event) {
ImageButton::OnMouseEntered(event);
- if (!maximizer_.get()) {
+ if (!maximizer_) {
DCHECK(GetWidget());
if (!widget_) {
widget_ = frame_->GetWidget();
@@ -225,7 +225,7 @@ void FrameMaximizeButton::OnMouseExited(const ui::MouseEvent& event) {
ImageButton::OnMouseExited(event);
// Remove the bubble menu when the button is not pressed and the mouse is not
// within the bubble.
- if (!is_snap_enabled_ && maximizer_.get()) {
+ if (!is_snap_enabled_ && maximizer_) {
if (maximizer_->GetBubbleWindow()) {
gfx::Point screen_location = Shell::GetScreen()->GetCursorScreenPoint();
if (!maximizer_->GetBubbleWindow()->GetBoundsInScreen().Contains(
@@ -309,7 +309,7 @@ void FrameMaximizeButton::OnGestureEvent(ui::GestureEvent* event) {
void FrameMaximizeButton::ProcessStartEvent(const ui::LocatedEvent& event) {
DCHECK(is_snap_enabled_);
// Prepare the help menu.
- if (!maximizer_.get()) {
+ if (!maximizer_) {
maximizer_.reset(new MaximizeBubbleController(
this,
GetMaximizeBubbleFrameState(),
@@ -379,7 +379,7 @@ void FrameMaximizeButton::Cancel(bool keep_menu_open) {
}
void FrameMaximizeButton::InstallEventFilter() {
- if (escape_event_filter_.get())
+ if (escape_event_filter_)
return;
escape_event_filter_.reset(new EscapeEventFilter(this));
@@ -402,7 +402,7 @@ void FrameMaximizeButton::UpdateSnap(const gfx::Point& location,
bool is_touch) {
SnapType type = SnapTypeForLocation(location);
if (type == snap_type_) {
- if (snap_sizer_.get()) {
+ if (snap_sizer_) {
snap_sizer_->Update(LocationForSnapSizer(location));
phantom_window_->Show(ScreenAsh::ConvertRectToScreen(
frame_->GetWidget()->GetNativeView()->parent(),
@@ -433,11 +433,11 @@ void FrameMaximizeButton::UpdateSnap(const gfx::Point& location,
if (select_default)
snap_sizer_->SelectDefaultSizeAndDisableResize();
}
- if (!phantom_window_.get()) {
+ if (!phantom_window_) {
phantom_window_.reset(new internal::PhantomWindowController(
frame_->GetWidget()->GetNativeWindow()));
}
- if (maximizer_.get()) {
+ if (maximizer_) {
phantom_window_->set_phantom_below_window(maximizer_->GetBubbleWindow());
maximizer_->SetSnapType(snap_type_);
}
« no previous file with comments | « ash/wm/window_cycle_controller.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698