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

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

Issue 2093283002: mash: Convert all of //ash/system to use WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
« no previous file with comments | « ash/system/cast/tray_cast.cc ('k') | ash/system/chromeos/screen_security/screen_tray_item.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/ash_switches.h" 7 #include "ash/common/ash_switches.h"
8 #include "ash/common/shelf/wm_shelf_util.h" 8 #include "ash/common/shelf/wm_shelf_util.h"
9 #include "ash/common/system/tray/system_tray_delegate.h" 9 #include "ash/common/system/tray/system_tray_delegate.h"
10 #include "ash/common/system/tray/system_tray_notifier.h" 10 #include "ash/common/system/tray/system_tray_notifier.h"
11 #include "ash/common/system/tray/tray_constants.h" 11 #include "ash/common/system/tray/tray_constants.h"
12 #include "ash/common/system/tray/tray_item_more.h" 12 #include "ash/common/system/tray/tray_item_more.h"
13 #include "ash/common/system/tray/tray_item_view.h" 13 #include "ash/common/system/tray/tray_item_view.h"
14 #include "ash/common/system/tray/tray_utils.h" 14 #include "ash/common/system/tray/tray_utils.h"
15 #include "ash/common/wm_shell.h" 15 #include "ash/common/wm_shell.h"
16 #include "ash/shelf/shelf_util.h"
17 #include "ash/system/chromeos/network/network_state_list_detailed_view.h" 16 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
18 #include "ash/system/chromeos/network/tray_network_state_observer.h" 17 #include "ash/system/chromeos/network/tray_network_state_observer.h"
19 #include "ash/system/tray/system_tray.h" 18 #include "ash/system/tray/system_tray.h"
20 #include "base/command_line.h" 19 #include "base/command_line.h"
21 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
22 #include "chromeos/network/network_state.h" 21 #include "chromeos/network/network_state.h"
23 #include "chromeos/network/network_state_handler.h" 22 #include "chromeos/network/network_state_handler.h"
24 #include "grit/ash_resources.h" 23 #include "grit/ash_resources.h"
25 #include "grit/ash_strings.h" 24 #include "grit/ash_strings.h"
26 #include "grit/ui_chromeos_strings.h" 25 #include "grit/ui_chromeos_strings.h"
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 void TrayNetwork::NetworkStateChanged() { 330 void TrayNetwork::NetworkStateChanged() {
332 if (tray_) 331 if (tray_)
333 tray_->UpdateNetworkStateHandlerIcon(); 332 tray_->UpdateNetworkStateHandlerIcon();
334 if (default_) 333 if (default_)
335 default_->Update(); 334 default_->Update();
336 if (detailed_) 335 if (detailed_)
337 detailed_->Update(); 336 detailed_->Update();
338 } 337 }
339 338
340 } // namespace ash 339 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/cast/tray_cast.cc ('k') | ash/system/chromeos/screen_security/screen_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698