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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/network_dropdown.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iwyu fixes 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 CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
7 7
8 #include <memory>
dcheng 2016/04/07 21:18:54 Usually I just add scoped_ptr.h, but this collides
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/timer/timer.h" 11 #include "base/timer/timer.h"
10 #include "chrome/browser/chromeos/status/network_menu.h" 12 #include "chrome/browser/chromeos/status/network_menu.h"
11 #include "chromeos/network/network_state_handler_observer.h" 13 #include "chromeos/network/network_state_handler_observer.h"
12 #include "ui/chromeos/network/network_icon_animation_observer.h" 14 #include "ui/chromeos/network/network_icon_animation_observer.h"
13 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
14 16
15 namespace content { 17 namespace content {
16 class WebUI; 18 class WebUI;
17 } 19 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 void Refresh(); 60 void Refresh();
59 61
60 private: 62 private:
61 void SetNetworkIconAndText(); 63 void SetNetworkIconAndText();
62 64
63 // Request a network scan and refreshes control state. Should be called 65 // Request a network scan and refreshes control state. Should be called
64 // by |network_scan_timer_| only. 66 // by |network_scan_timer_| only.
65 void RequestNetworkScan(); 67 void RequestNetworkScan();
66 68
67 // The Network menu. 69 // The Network menu.
68 scoped_ptr<NetworkMenuWebUI> network_menu_; 70 std::unique_ptr<NetworkMenuWebUI> network_menu_;
69 71
70 Actor* actor_; 72 Actor* actor_;
71 73
72 content::WebUI* web_ui_; 74 content::WebUI* web_ui_;
73 75
74 // Is the dropdown shown on one of the OOBE screens. 76 // Is the dropdown shown on one of the OOBE screens.
75 bool oobe_; 77 bool oobe_;
76 78
77 // Timer used to periodically force network scan. 79 // Timer used to periodically force network scan.
78 base::RepeatingTimer network_scan_timer_; 80 base::RepeatingTimer network_scan_timer_;
79 81
80 DISALLOW_COPY_AND_ASSIGN(NetworkDropdown); 82 DISALLOW_COPY_AND_ASSIGN(NetworkDropdown);
81 }; 83 };
82 84
83 } // namespace chromeos 85 } // namespace chromeos
84 86
85 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ 87 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698