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

Unified Diff: ash/root_window_controller.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 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/networking_config_delegate.h ('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/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 3e1f373d47326be7adea085c3b3210c0426d31e1..517de7f6d9b21ea81d085aef6cedb6a49bd883d2 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -6,13 +6,13 @@
#define ASH_ROOT_WINDOW_CONTROLLER_H_
#include <map>
+#include <memory>
#include "ash/ash_export.h"
#include "ash/shelf/shelf_types.h"
#include "ash/shell_observer.h"
#include "ash/system/user/login_status.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/ui_base_types.h"
@@ -257,20 +257,20 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
void OnLoginStateChanged(user::LoginStatus status) override;
void OnTouchHudProjectionToggled(bool enabled) override;
- scoped_ptr<AshWindowTreeHost> ash_host_;
+ std::unique_ptr<AshWindowTreeHost> ash_host_;
RootWindowLayoutManager* root_window_layout_;
- scoped_ptr<StackingController> stacking_controller_;
+ std::unique_ptr<StackingController> stacking_controller_;
// The shelf for managing the shelf and the status widget.
- scoped_ptr<ShelfWidget> shelf_;
+ std::unique_ptr<ShelfWidget> shelf_;
// An invisible/empty window used as a event target for
// |MouseCursorEventFilter| before a user logs in.
// (crbug.com/266987)
// Its container is |LockScreenBackgroundContainer| and
// this must be deleted before the container is deleted.
- scoped_ptr<aura::Window> mouse_event_target_;
+ std::unique_ptr<aura::Window> mouse_event_target_;
// Manages layout of docked windows. Owned by DockedContainer.
DockedWindowLayoutManager* docked_layout_manager_;
@@ -278,17 +278,17 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
// Manages layout of panels. Owned by PanelContainer.
PanelLayoutManager* panel_layout_manager_;
- scoped_ptr<SystemBackgroundController> system_background_;
+ std::unique_ptr<SystemBackgroundController> system_background_;
#if defined(OS_CHROMEOS)
- scoped_ptr<BootSplashScreen> boot_splash_screen_;
+ std::unique_ptr<BootSplashScreen> boot_splash_screen_;
// Responsible for initializing TouchExplorationController when spoken
// feedback is on.
- scoped_ptr<AshTouchExplorationManager> touch_exploration_manager_;
+ std::unique_ptr<AshTouchExplorationManager> touch_exploration_manager_;
#endif
- scoped_ptr<WorkspaceController> workspace_controller_;
- scoped_ptr<AlwaysOnTopController> always_on_top_controller_;
+ std::unique_ptr<WorkspaceController> workspace_controller_;
+ std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
// Heads-up displays for touch events. These HUDs are not owned by the root
// window controller and manage their own lifetimes.
@@ -296,11 +296,11 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
TouchHudProjection* touch_hud_projection_;
// Handles double clicks on the panel window header.
- scoped_ptr<ui::EventHandler> panel_container_handler_;
+ std::unique_ptr<ui::EventHandler> panel_container_handler_;
- scoped_ptr<DesktopBackgroundWidgetController> wallpaper_controller_;
- scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_;
- scoped_ptr< ::wm::ScopedCaptureClient> capture_client_;
+ std::unique_ptr<DesktopBackgroundWidgetController> wallpaper_controller_;
+ std::unique_ptr<AnimatingDesktopController> animating_wallpaper_controller_;
+ std::unique_ptr<::wm::ScopedCaptureClient> capture_client_;
DISALLOW_COPY_AND_ASSIGN(RootWindowController);
};
« no previous file with comments | « ash/networking_config_delegate.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698