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

Side by Side Diff: ash/shell/window_type_launcher.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/shell_delegate_impl.cc ('k') | ash/shell/window_type_launcher.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_WINDOW_TYPE_LAUNCHER_H_ 5 #ifndef ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
6 #define ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_ 6 #define ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "ui/views/context_menu_controller.h" 11 #include "ui/views/context_menu_controller.h"
10 #include "ui/views/controls/button/button.h" 12 #include "ui/views/controls/button/button.h"
11 #include "ui/views/controls/menu/menu_delegate.h" 13 #include "ui/views/controls/menu/menu_delegate.h"
12 #include "ui/views/widget/widget_delegate.h" 14 #include "ui/views/widget/widget_delegate.h"
13 15
14 namespace views { 16 namespace views {
15 class MenuRunner; 17 class MenuRunner;
16 class LabelButton; 18 class LabelButton;
17 } 19 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 views::LabelButton* bubble_button_; 67 views::LabelButton* bubble_button_;
66 views::LabelButton* lock_button_; 68 views::LabelButton* lock_button_;
67 views::LabelButton* widgets_button_; 69 views::LabelButton* widgets_button_;
68 views::LabelButton* system_modal_button_; 70 views::LabelButton* system_modal_button_;
69 views::LabelButton* window_modal_button_; 71 views::LabelButton* window_modal_button_;
70 views::LabelButton* child_modal_button_; 72 views::LabelButton* child_modal_button_;
71 views::LabelButton* transient_button_; 73 views::LabelButton* transient_button_;
72 views::LabelButton* examples_button_; 74 views::LabelButton* examples_button_;
73 views::LabelButton* show_hide_window_button_; 75 views::LabelButton* show_hide_window_button_;
74 views::LabelButton* show_web_notification_; 76 views::LabelButton* show_web_notification_;
75 scoped_ptr<views::MenuRunner> menu_runner_; 77 std::unique_ptr<views::MenuRunner> menu_runner_;
76 78
77 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher); 79 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher);
78 }; 80 };
79 81
80 } // namespace shell 82 } // namespace shell
81 } // namespace ash 83 } // namespace ash
82 84
83 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_ 85 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698