OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_APP_LIST_APP_LIST_SHOWER_VIEWS_H_ | 5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SHOWER_VIEWS_H_ |
6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SHOWER_VIEWS_H_ | 6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SHOWER_VIEWS_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "ui/gfx/native_widget_types.h" | 11 #include "ui/gfx/native_widget_types.h" |
11 | 12 |
12 namespace app_list { | 13 namespace app_list { |
13 class AppListView; | 14 class AppListView; |
14 } | 15 } |
15 | 16 |
16 class AppListShowerDelegate; | 17 class AppListShowerDelegate; |
17 class AppListShowerUnitTest; | 18 class AppListShowerUnitTest; |
18 class Profile; | 19 class Profile; |
19 class ScopedKeepAlive; | 20 class ScopedKeepAlive; |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 | 59 |
59 AppListShowerDelegate* delegate_; // Weak. Owns this. | 60 AppListShowerDelegate* delegate_; // Weak. Owns this. |
60 | 61 |
61 // The profile currently shown by |app_list_|. | 62 // The profile currently shown by |app_list_|. |
62 Profile* profile_; | 63 Profile* profile_; |
63 | 64 |
64 // The view, once created. Owned by native widget. | 65 // The view, once created. Owned by native widget. |
65 app_list::AppListView* app_list_; | 66 app_list::AppListView* app_list_; |
66 | 67 |
67 // Used to keep the browser process alive while the app list is visible. | 68 // Used to keep the browser process alive while the app list is visible. |
68 scoped_ptr<ScopedKeepAlive> keep_alive_; | 69 std::unique_ptr<ScopedKeepAlive> keep_alive_; |
69 | 70 |
70 bool window_icon_updated_; | 71 bool window_icon_updated_; |
71 | 72 |
72 DISALLOW_COPY_AND_ASSIGN(AppListShower); | 73 DISALLOW_COPY_AND_ASSIGN(AppListShower); |
73 }; | 74 }; |
74 | 75 |
75 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SHOWER_VIEWS_H_ | 76 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SHOWER_VIEWS_H_ |
OLD | NEW |