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

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: 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 (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
oshima 2016/04/08 07:09:41 include
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/views/context_menu_controller.h" 9 #include "ui/views/context_menu_controller.h"
10 #include "ui/views/controls/button/button.h" 10 #include "ui/views/controls/button/button.h"
11 #include "ui/views/controls/menu/menu_delegate.h" 11 #include "ui/views/controls/menu/menu_delegate.h"
12 #include "ui/views/widget/widget_delegate.h" 12 #include "ui/views/widget/widget_delegate.h"
13 13
14 namespace views { 14 namespace views {
15 class MenuRunner; 15 class MenuRunner;
16 class LabelButton; 16 class LabelButton;
17 } 17 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 views::LabelButton* bubble_button_; 65 views::LabelButton* bubble_button_;
66 views::LabelButton* lock_button_; 66 views::LabelButton* lock_button_;
67 views::LabelButton* widgets_button_; 67 views::LabelButton* widgets_button_;
68 views::LabelButton* system_modal_button_; 68 views::LabelButton* system_modal_button_;
69 views::LabelButton* window_modal_button_; 69 views::LabelButton* window_modal_button_;
70 views::LabelButton* child_modal_button_; 70 views::LabelButton* child_modal_button_;
71 views::LabelButton* transient_button_; 71 views::LabelButton* transient_button_;
72 views::LabelButton* examples_button_; 72 views::LabelButton* examples_button_;
73 views::LabelButton* show_hide_window_button_; 73 views::LabelButton* show_hide_window_button_;
74 views::LabelButton* show_web_notification_; 74 views::LabelButton* show_web_notification_;
75 scoped_ptr<views::MenuRunner> menu_runner_; 75 std::unique_ptr<views::MenuRunner> menu_runner_;
76 76
77 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher); 77 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher);
78 }; 78 };
79 79
80 } // namespace shell 80 } // namespace shell
81 } // namespace ash 81 } // namespace ash
82 82
83 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_ 83 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698