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

Side by Side Diff: ash/shell/shell_delegate_impl.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 unified diff | Download patch
« no previous file with comments | « ash/shell/content/client/shell_main_delegate.h ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_
6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "ash/shell_delegate.h" 11 #include "ash/shell_delegate.h"
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 14
14 namespace keyboard { 15 namespace keyboard {
15 class KeyboardUI; 16 class KeyboardUI;
16 } 17 }
17 18
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 ash::NewWindowDelegate* CreateNewWindowDelegate() override; 51 ash::NewWindowDelegate* CreateNewWindowDelegate() override;
51 ash::MediaDelegate* CreateMediaDelegate() override; 52 ash::MediaDelegate* CreateMediaDelegate() override;
52 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, 53 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
53 const ash::ShelfItem* item) override; 54 const ash::ShelfItem* item) override;
54 GPUSupport* CreateGPUSupport() override; 55 GPUSupport* CreateGPUSupport() override;
55 base::string16 GetProductName() const override; 56 base::string16 GetProductName() const override;
56 gfx::Image GetDeprecatedAcceleratorImage() const override; 57 gfx::Image GetDeprecatedAcceleratorImage() const override;
57 58
58 private: 59 private:
59 ShelfDelegateImpl* shelf_delegate_; 60 ShelfDelegateImpl* shelf_delegate_;
60 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; 61 std::unique_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
61 62
62 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 63 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
63 }; 64 };
64 65
65 } // namespace shell 66 } // namespace shell
66 } // namespace ash 67 } // namespace ash
67 68
68 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 69 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell/content/client/shell_main_delegate.h ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698