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

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

Issue 2828893002: [Ash] Remove |highlight| field from NetworkInfo struct (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
« no previous file with comments | « no previous file | ash/system/network/network_info.cc » ('j') | ash/system/network/network_list.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_SYSTEM_NETWORK_NETWORK_INFO_H_ 5 #ifndef ASH_SYSTEM_NETWORK_NETWORK_INFO_H_
6 #define ASH_SYSTEM_NETWORK_NETWORK_INFO_H_ 6 #define ASH_SYSTEM_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.
22 struct NetworkInfo { 21 struct NetworkInfo {
23 enum class Type { UNKNOWN, WIFI, TETHER, CELLULAR }; 22 enum class Type { UNKNOWN, WIFI, TETHER, CELLULAR };
24 23
25 NetworkInfo(); 24 NetworkInfo();
26 NetworkInfo(const std::string& guid); 25 NetworkInfo(const std::string& guid);
27 ~NetworkInfo(); 26 ~NetworkInfo();
28 27
29 bool operator==(const NetworkInfo& other) const; 28 bool operator==(const NetworkInfo& other) const;
30 bool operator!=(const NetworkInfo& other) const { return !(*this == other); } 29 bool operator!=(const NetworkInfo& other) const { return !(*this == other); }
31 30
32 std::string guid; 31 std::string guid;
33 base::string16 label; 32 base::string16 label;
34 base::string16 tooltip; 33 base::string16 tooltip;
35 gfx::ImageSkia image; 34 gfx::ImageSkia image;
36 bool disable; 35 bool disable;
37 bool highlight;
38 bool connected; 36 bool connected;
39 bool connecting; 37 bool connecting;
40 Type type; 38 Type type;
41 }; 39 };
42 40
43 } // namespace ash 41 } // namespace ash
44 42
45 #endif // ASH_SYSTEM_NETWORK_NETWORK_INFO_H_ 43 #endif // ASH_SYSTEM_NETWORK_NETWORK_INFO_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/network/network_info.cc » ('j') | ash/system/network/network_list.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698