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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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 ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_ 5 #ifndef ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
6 #define ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_ 6 #define ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "ash/login_status.h" 11 #include "ash/common/login_status.h"
12 #include "ash/system/network/network_detailed_view.h" 12 #include "ash/system/network/network_detailed_view.h"
13 #include "ash/system/network/network_list_delegate.h" 13 #include "ash/system/network/network_list_delegate.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "ui/gfx/image/image.h" 16 #include "ui/gfx/image/image.h"
17 #include "ui/views/controls/button/button.h" 17 #include "ui/views/controls/button/button.h"
18 #include "ui/views/controls/button/custom_button.h" 18 #include "ui/views/controls/button/custom_button.h"
19 19
20 namespace chromeos { 20 namespace chromeos {
21 class NetworkTypePattern; 21 class NetworkTypePattern;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 std::unique_ptr<NetworkListViewBase> network_list_view_; 146 std::unique_ptr<NetworkListViewBase> network_list_view_;
147 147
148 DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView); 148 DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView);
149 }; 149 };
150 150
151 } // namespace tray 151 } // namespace tray
152 } // namespace ash 152 } // namespace ash
153 153
154 #endif // ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_ 154 #endif // ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698