diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 16:47:13 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 16:47:13 +0000 |
| commit | 7f7f65c6dec941a0be8d3aac48d7241f03ff0dbe (patch) | |
| tree | 4b27055eda57b685cf6183aa4684a6ec606f902b /ash/root_window_controller.cc | |
| parent | 59383c78c7b67b435ff4970060213928e1f153b8 (diff) | |
| download | chromium_src-7f7f65c6dec941a0be8d3aac48d7241f03ff0dbe.zip chromium_src-7f7f65c6dec941a0be8d3aac48d7241f03ff0dbe.tar.gz chromium_src-7f7f65c6dec941a0be8d3aac48d7241f03ff0dbe.tar.bz2 | |
Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>.
In r174057, ajwong@ added support for implicit testing to scoped_ptr<>. Removes
these in ash/.
BUG=232084
Review URL: https://codereview.chromium.org/14297013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 6a8e815..165a61d 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -207,7 +207,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()); @@ -348,7 +348,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(); } @@ -382,7 +382,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()) @@ -441,7 +441,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); @@ -466,7 +466,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 = |