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

Side by Side Diff: ash/system/chromeos/network/tray_network.cc

Issue 417793003: chromeos: Refactor the code for showing the network UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 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 | Annotate | Revision Log
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 #include "ash/system/chromeos/network/tray_network.h" 5 #include "ash/system/chromeos/network/tray_network.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/metrics/user_metrics_recorder.h" 8 #include "ash/metrics/user_metrics_recorder.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/chromeos/network/network_state_list_detailed_view.h" 10 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
11 #include "ash/system/chromeos/network/tray_network_state_observer.h" 11 #include "ash/system/chromeos/network/tray_network_state_observer.h"
12 #include "ash/system/tray/system_tray.h" 12 #include "ash/system/tray/system_tray.h"
13 #include "ash/system/tray/system_tray_delegate.h" 13 #include "ash/system/tray/system_tray_delegate.h"
14 #include "ash/system/tray/system_tray_notifier.h" 14 #include "ash/system/tray/system_tray_notifier.h"
15 #include "ash/system/tray/tray_constants.h" 15 #include "ash/system/tray/tray_constants.h"
16 #include "ash/system/tray/tray_item_more.h" 16 #include "ash/system/tray/tray_item_more.h"
17 #include "ash/system/tray/tray_item_view.h" 17 #include "ash/system/tray/tray_item_view.h"
18 #include "ash/system/tray/tray_utils.h" 18 #include "ash/system/tray/tray_utils.h"
19 #include "base/command_line.h" 19 #include "base/command_line.h"
20 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
21 #include "chromeos/network/network_state.h" 21 #include "chromeos/network/network_state.h"
22 #include "chromeos/network/network_state_handler.h" 22 #include "chromeos/network/network_state_handler.h"
23 #include "grit/ash_resources.h" 23 #include "grit/ash_resources.h"
24 #include "grit/ash_strings.h" 24 #include "grit/ash_strings.h"
25 #include "grit/ui_chromeos_strings.h" 25 #include "grit/ui_chromeos_strings.h"
26 #include "third_party/cros_system_api/dbus/service_constants.h" 26 #include "third_party/cros_system_api/dbus/service_constants.h"
27 #include "ui/accessibility/ax_view_state.h" 27 #include "ui/accessibility/ax_view_state.h"
28 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/base/resource/resource_bundle.h" 29 #include "ui/base/resource/resource_bundle.h"
30 #include "ui/chromeos/network/network_icon.h"
30 #include "ui/chromeos/network/network_icon_animation.h" 31 #include "ui/chromeos/network/network_icon_animation.h"
31 #include "ui/views/controls/image_view.h" 32 #include "ui/views/controls/image_view.h"
32 #include "ui/views/controls/link.h" 33 #include "ui/views/controls/link.h"
33 #include "ui/views/controls/link_listener.h" 34 #include "ui/views/controls/link_listener.h"
34 #include "ui/views/layout/box_layout.h" 35 #include "ui/views/layout/box_layout.h"
35 #include "ui/views/widget/widget.h" 36 #include "ui/views/widget/widget.h"
36 37
37 using chromeos::NetworkHandler; 38 using chromeos::NetworkHandler;
38 using chromeos::NetworkState; 39 using chromeos::NetworkState;
39 using chromeos::NetworkStateHandler; 40 using chromeos::NetworkStateHandler;
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 detailed_->ManagerChanged(); 369 detailed_->ManagerChanged();
369 } 370 }
370 } 371 }
371 372
372 void TrayNetwork::NetworkServiceChanged(const chromeos::NetworkState* network) { 373 void TrayNetwork::NetworkServiceChanged(const chromeos::NetworkState* network) {
373 if (detailed_) 374 if (detailed_)
374 detailed_->NetworkServiceChanged(network); 375 detailed_->NetworkServiceChanged(network);
375 } 376 }
376 377
377 } // namespace ash 378 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/system/chromeos/network/tray_vpn.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698