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

Unified Diff: ash/root_window_controller.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/launcher/launcher_view.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index a975fa8ec0c402723103a4d052fbe940096f14fd..4cab59ec13c1d59833b5ed4d1ce023512fd16f76 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -206,7 +206,7 @@ void RootWindowController::Shutdown() {
SetTouchObserverHUD(NULL);
CloseChildWindows();
- if (Shell::GetActiveRootWindow() == root_window_.get()) {
+ if (Shell::GetActiveRootWindow() == root_window_) {
Shell::GetInstance()->set_active_root_window(
Shell::GetPrimaryRootWindow() == root_window_.get() ?
NULL : Shell::GetPrimaryRootWindow());
@@ -347,7 +347,7 @@ void RootWindowController::ShowLauncher() {
void RootWindowController::OnLoginStateChanged(user::LoginStatus status) {
// TODO(oshima): remove if when launcher per display is enabled by
// default.
- if (shelf_.get())
+ if (shelf_)
shelf_->shelf_layout_manager()->UpdateVisibilityState();
}
@@ -381,7 +381,7 @@ void RootWindowController::CloseChildWindows() {
}
// TODO(harrym): Remove when Status Area Widget is a child view.
- if (shelf_.get())
+ if (shelf_)
shelf_->ShutdownStatusAreaWidget();
if (shelf_.get() && shelf_->shelf_layout_manager())
@@ -440,7 +440,7 @@ void RootWindowController::MoveWindowsTo(aura::RootWindow* dst) {
}
void RootWindowController::SetTouchObserverHUD(TouchObserverHUD* hud) {
- if (touch_observer_hud_.get())
+ if (touch_observer_hud_)
root_window_->RemovePreTargetHandler(touch_observer_hud_.get());
if (hud)
root_window_->AddPreTargetHandler(hud);
@@ -465,7 +465,7 @@ void RootWindowController::ShowContextMenu(
DCHECK(Shell::GetInstance()->delegate());
scoped_ptr<ui::MenuModel> menu_model(
Shell::GetInstance()->delegate()->CreateContextMenu(target));
- if (!menu_model.get())
+ if (!menu_model)
return;
internal::DesktopBackgroundWidgetController* background =
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698