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

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h
index 464705b5946e779f1a8284eba2bc7df7334e5eb2..723091e27ae2e96c48ba3f08f708bb504119a983 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h
@@ -5,8 +5,9 @@
#ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_ASH_H_
#define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_ASH_H_
+#include <memory>
+
#include "base/gtest_prod_util.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h"
#include "ui/views/context_menu_controller.h"
@@ -66,11 +67,11 @@ class ChromeNativeAppWindowViewsAuraAsh : public ChromeNativeAppWindowViewsAura,
// immersive fullscreen, the window header (title bar and window controls)
// slides onscreen as an overlay when the mouse is hovered at the top of the
// screen.
- scoped_ptr<ash::ImmersiveFullscreenController>
+ std::unique_ptr<ash::ImmersiveFullscreenController>
immersive_fullscreen_controller_;
// Used to show the system menu.
- scoped_ptr<views::MenuRunner> menu_runner_;
+ std::unique_ptr<views::MenuRunner> menu_runner_;
DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsAuraAsh);
};

Powered by Google App Engine
This is Rietveld 408576698