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

Unified Diff: ash/launcher/launcher_view.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/focus_cycler_unittest.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_view.cc
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index c4a9d56d347e5409771e4b00f12bf495c2cb6e72..810baed3b919cee40765668fe34e89e7d1930328 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -440,7 +440,7 @@ void LauncherView::OnShelfAlignmentChanged() {
view_model_->view_at(i)->Layout();
}
tooltip_->UpdateArrow();
- if (overflow_bubble_.get())
+ if (overflow_bubble_)
overflow_bubble_->Hide();
}
@@ -675,7 +675,7 @@ void LauncherView::CalculateIdealBounds(IdealBounds* bounds) {
if (overflow_bubble_.get() && overflow_bubble_->IsShowing())
UpdateOverflowRange(overflow_bubble_->launcher_view());
} else {
- if (overflow_bubble_.get())
+ if (overflow_bubble_)
overflow_bubble_->Hide();
}
}
@@ -935,7 +935,7 @@ void LauncherView::ToggleOverflowBubble() {
return;
}
- if (!overflow_bubble_.get())
+ if (!overflow_bubble_)
overflow_bubble_.reset(new OverflowBubble());
LauncherView* overflow_view = new LauncherView(
@@ -1406,7 +1406,7 @@ void LauncherView::ShowContextMenuForView(views::View* source,
scoped_ptr<ui::MenuModel> menu_model(delegate_->CreateContextMenu(
model_->items()[view_index],
source->GetWidget()->GetNativeView()->GetRootWindow()));
- if (!menu_model.get())
+ if (!menu_model)
return;
base::AutoReset<LauncherID> reseter(
&context_menu_id_,
@@ -1485,7 +1485,7 @@ void LauncherView::ShowMenu(
// Unpinning an item will reset the |launcher_menu_runner_| before coming
// here.
- if (launcher_menu_runner_.get())
+ if (launcher_menu_runner_)
closing_event_time_ = launcher_menu_runner_->closing_event_time();
Shell::GetInstance()->UpdateShelfVisibility();
}
« no previous file with comments | « ash/focus_cycler_unittest.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698