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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_ASH_H_
7 7
8 #include <memory>
9
8 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h" 11 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h"
11 #include "ui/views/context_menu_controller.h" 12 #include "ui/views/context_menu_controller.h"
12 13
13 namespace ash { 14 namespace ash {
14 class ImmersiveFullscreenController; 15 class ImmersiveFullscreenController;
15 } 16 }
16 17
17 namespace views { 18 namespace views {
18 class MenuRunner; 19 class MenuRunner;
19 } 20 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 void SetFullscreen(int fullscreen_types) override; 60 void SetFullscreen(int fullscreen_types) override;
60 61
61 private: 62 private:
62 FRIEND_TEST_ALL_PREFIXES(ShapedAppWindowTargeterTest, 63 FRIEND_TEST_ALL_PREFIXES(ShapedAppWindowTargeterTest,
63 ResizeInsetsWithinBounds); 64 ResizeInsetsWithinBounds);
64 65
65 // Used to put non-frameless windows into immersive fullscreen on ChromeOS. In 66 // Used to put non-frameless windows into immersive fullscreen on ChromeOS. In
66 // immersive fullscreen, the window header (title bar and window controls) 67 // immersive fullscreen, the window header (title bar and window controls)
67 // slides onscreen as an overlay when the mouse is hovered at the top of the 68 // slides onscreen as an overlay when the mouse is hovered at the top of the
68 // screen. 69 // screen.
69 scoped_ptr<ash::ImmersiveFullscreenController> 70 std::unique_ptr<ash::ImmersiveFullscreenController>
70 immersive_fullscreen_controller_; 71 immersive_fullscreen_controller_;
71 72
72 // Used to show the system menu. 73 // Used to show the system menu.
73 scoped_ptr<views::MenuRunner> menu_runner_; 74 std::unique_ptr<views::MenuRunner> menu_runner_;
74 75
75 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsAuraAsh); 76 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsAuraAsh);
76 }; 77 };
77 78
78 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_ASH_ H_ 79 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_ASH_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698