| OLD | NEW |
| 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 CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ | 6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <string> | 9 #include <string> |
| 9 #include <vector> | 10 #include <vector> |
| 10 | 11 |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
| 15 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow | 15 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow |
| 16 | 16 |
| 17 class Browser; | 17 class Browser; |
| 18 | 18 |
| 19 namespace ui { | 19 namespace ui { |
| 20 class MenuModel; | 20 class MenuModel; |
| 21 } | 21 } |
| 22 | 22 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 // Getters. | 86 // Getters. |
| 87 Delegate* delegate() const { return delegate_; } | 87 Delegate* delegate() const { return delegate_; } |
| 88 | 88 |
| 89 // Weak ptr to delegate. | 89 // Weak ptr to delegate. |
| 90 Delegate* delegate_; | 90 Delegate* delegate_; |
| 91 | 91 |
| 92 // Set to true if we are currently refreshing the menu. | 92 // Set to true if we are currently refreshing the menu. |
| 93 bool refreshing_menu_; | 93 bool refreshing_menu_; |
| 94 | 94 |
| 95 // The network menu. | 95 // The network menu. |
| 96 scoped_ptr<NetworkMenuModel> main_menu_model_; | 96 std::unique_ptr<NetworkMenuModel> main_menu_model_; |
| 97 | 97 |
| 98 // Weak pointer factory so we can start connections at a later time | 98 // Weak pointer factory so we can start connections at a later time |
| 99 // without worrying that they will actually try to happen after the lifetime | 99 // without worrying that they will actually try to happen after the lifetime |
| 100 // of this object. | 100 // of this object. |
| 101 base::WeakPtrFactory<NetworkMenu> weak_pointer_factory_; | 101 base::WeakPtrFactory<NetworkMenu> weak_pointer_factory_; |
| 102 | 102 |
| 103 DISALLOW_COPY_AND_ASSIGN(NetworkMenu); | 103 DISALLOW_COPY_AND_ASSIGN(NetworkMenu); |
| 104 }; | 104 }; |
| 105 | 105 |
| 106 } // namespace chromeos | 106 } // namespace chromeos |
| 107 | 107 |
| 108 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ | 108 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_ |
| OLD | NEW |