Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 7b809cb0f826ca6e76cfd9f135549ea51f5c7986..579cae5683d88360ed7210ca448eb4bc6dcf8e1b 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -245,7 +245,7 @@ Shell::~Shell() { |
RemovePreTargetHandler(overlay_filter_.get()); |
RemovePreTargetHandler(input_method_filter_.get()); |
RemovePreTargetHandler(window_modality_controller_.get()); |
- if (mouse_cursor_filter_.get()) |
+ if (mouse_cursor_filter_) |
RemovePreTargetHandler(mouse_cursor_filter_.get()); |
RemovePreTargetHandler(system_gesture_filter_.get()); |
#if !defined(OS_MACOSX) |
@@ -305,11 +305,11 @@ Shell::~Shell() { |
activation_controller_.reset(); |
#if defined(OS_CHROMEOS) |
- if (display_change_observer_.get()) |
+ if (display_change_observer_) |
output_configurator_->RemoveObserver(display_change_observer_.get()); |
- if (output_configurator_animation_.get()) |
+ if (output_configurator_animation_) |
output_configurator_->RemoveObserver(output_configurator_animation_.get()); |
- if (display_error_observer_.get()) |
+ if (display_error_observer_) |
output_configurator_->RemoveObserver(display_error_observer_.get()); |
base::MessagePumpAuraX11::Current()->RemoveDispatcherForRootWindow( |
output_configurator()); |
@@ -553,7 +553,7 @@ void Shell::Init() { |
// This controller needs to be set before SetupManagedWindowMode. |
desktop_background_controller_.reset(new DesktopBackgroundController()); |
user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate()); |
- if (!user_wallpaper_delegate_.get()) |
+ if (!user_wallpaper_delegate_) |
user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate()); |
// StatusAreaWidget uses Shell's CapsLockDelegate. |
@@ -570,7 +570,7 @@ void Shell::Init() { |
// Initialize system_tray_delegate_ before initializing StatusAreaWidget. |
system_tray_delegate_.reset(delegate()->CreateSystemTrayDelegate()); |
- if (!system_tray_delegate_.get()) |
+ if (!system_tray_delegate_) |
system_tray_delegate_.reset(SystemTrayDelegate::CreateDummyDelegate()); |
// Creates StatusAreaWidget. |
@@ -626,7 +626,7 @@ void Shell::ToggleAppList(aura::Window* window) { |
// If the context window is not given, show it on the active root window. |
if (!window) |
window = GetActiveRootWindow(); |
- if (!app_list_controller_.get()) |
+ if (!app_list_controller_) |
app_list_controller_.reset(new internal::AppListController); |
app_list_controller_->SetVisible(!app_list_controller_->IsVisible(), window); |
} |
@@ -785,7 +785,7 @@ void Shell::SetDimming(bool should_dim) { |
} |
void Shell::CreateModalBackground(aura::Window* window) { |
- if (!modality_filter_.get()) { |
+ if (!modality_filter_) { |
modality_filter_.reset(new internal::SystemModalContainerEventFilter(this)); |
AddPreTargetHandler(modality_filter_.get()); |
} |
@@ -827,7 +827,7 @@ SystemTray* Shell::GetPrimarySystemTray() { |
} |
LauncherDelegate* Shell::GetLauncherDelegate() { |
- if (!launcher_delegate_.get()) { |
+ if (!launcher_delegate_) { |
launcher_model_.reset(new LauncherModel); |
launcher_delegate_.reset( |
delegate_->CreateLauncherDelegate(launcher_model_.get())); |
@@ -886,11 +886,11 @@ void Shell::InitRootWindowController( |
aura::client::SetTooltipClient(root_window, tooltip_controller_.get()); |
aura::client::SetEventClient(root_window, event_client_.get()); |
- if (nested_dispatcher_controller_.get()) { |
+ if (nested_dispatcher_controller_) { |
aura::client::SetDispatcherClient(root_window, |
nested_dispatcher_controller_.get()); |
} |
- if (user_action_client_.get()) |
+ if (user_action_client_) |
aura::client::SetUserActionClient(root_window, user_action_client_.get()); |
root_window->SetCursor(ui::kCursorPointer); |