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

Side by Side Diff: ash/common/system/chromeos/network/network_info.h

Issue 2795143005: [Ash] Remove pre-MD code paths from HoverHighlightView (Closed)
Patch Set: Created 3 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 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 ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_INFO_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_INFO_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_INFO_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
11 #include "ui/gfx/image/image_skia.h" 11 #include "ui/gfx/image/image_skia.h"
12 12
13 namespace gfx { 13 namespace gfx {
14 class ImageSkia; 14 class ImageSkia;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
18 18
19 // Includes information necessary about a network for displaying the appropriate 19 // Includes information necessary about a network for displaying the appropriate
20 // UI to the user. 20 // UI to the user.
21 // TODO(tdanderson): Remove the |highlight| member. See crbug.com/708190.
Evan Stade 2017/04/04 17:18:18 why add a TODO instead of removing right away? Is
tdanderson 2017/04/04 18:45:06 It looked like it is still used in network orderin
21 struct NetworkInfo { 22 struct NetworkInfo {
22 enum class Type { UNKNOWN, WIFI, TETHER, CELLULAR }; 23 enum class Type { UNKNOWN, WIFI, TETHER, CELLULAR };
23 24
24 NetworkInfo(); 25 NetworkInfo();
25 NetworkInfo(const std::string& guid); 26 NetworkInfo(const std::string& guid);
26 ~NetworkInfo(); 27 ~NetworkInfo();
27 28
28 bool operator==(const NetworkInfo& other) const; 29 bool operator==(const NetworkInfo& other) const;
29 bool operator!=(const NetworkInfo& other) const { return !(*this == other); } 30 bool operator!=(const NetworkInfo& other) const { return !(*this == other); }
30 31
31 std::string guid; 32 std::string guid;
32 base::string16 label; 33 base::string16 label;
33 base::string16 tooltip; 34 base::string16 tooltip;
34 gfx::ImageSkia image; 35 gfx::ImageSkia image;
35 bool disable; 36 bool disable;
36 bool highlight; 37 bool highlight;
37 bool connected; 38 bool connected;
38 bool connecting; 39 bool connecting;
39 Type type; 40 Type type;
40 }; 41 };
41 42
42 } // namespace ash 43 } // namespace ash
43 44
44 #endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_INFO_H_ 45 #endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_INFO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698