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

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

Issue 14949004: ash: Rename tray_views.{h,cc} to tray_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browsertest Created 7 years, 7 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/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/chromeos/network/network_icon_animation.h" 9 #include "ash/system/chromeos/network/network_icon_animation.h"
10 #include "ash/system/chromeos/network/network_list_detailed_view.h" 10 #include "ash/system/chromeos/network/network_list_detailed_view.h"
11 #include "ash/system/chromeos/network/network_list_detailed_view_base.h" 11 #include "ash/system/chromeos/network/network_list_detailed_view_base.h"
12 #include "ash/system/chromeos/network/network_state_list_detailed_view.h" 12 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
13 #include "ash/system/chromeos/network/network_state_notifier.h" 13 #include "ash/system/chromeos/network/network_state_notifier.h"
14 #include "ash/system/chromeos/network/network_tray_delegate.h" 14 #include "ash/system/chromeos/network/network_tray_delegate.h"
15 #include "ash/system/tray/system_tray.h" 15 #include "ash/system/tray/system_tray.h"
16 #include "ash/system/tray/system_tray_delegate.h" 16 #include "ash/system/tray/system_tray_delegate.h"
17 #include "ash/system/tray/system_tray_notifier.h" 17 #include "ash/system/tray/system_tray_notifier.h"
18 #include "ash/system/tray/tray_constants.h" 18 #include "ash/system/tray/tray_constants.h"
19 #include "ash/system/tray/tray_item_more.h" 19 #include "ash/system/tray/tray_item_more.h"
20 #include "ash/system/tray/tray_item_view.h" 20 #include "ash/system/tray/tray_item_view.h"
21 #include "ash/system/tray/tray_notification_view.h" 21 #include "ash/system/tray/tray_notification_view.h"
22 #include "ash/system/tray/tray_utils.h"
22 #include "base/command_line.h" 23 #include "base/command_line.h"
23 #include "base/utf_string_conversions.h" 24 #include "base/utf_string_conversions.h"
24 #include "chromeos/network/network_state.h" 25 #include "chromeos/network/network_state.h"
25 #include "chromeos/network/network_state_handler.h" 26 #include "chromeos/network/network_state_handler.h"
26 #include "grit/ash_resources.h" 27 #include "grit/ash_resources.h"
27 #include "grit/ash_strings.h" 28 #include "grit/ash_strings.h"
28 #include "third_party/cros_system_api/dbus/service_constants.h" 29 #include "third_party/cros_system_api/dbus/service_constants.h"
29 #include "ui/base/accessibility/accessible_view_state.h" 30 #include "ui/base/accessibility/accessible_view_state.h"
30 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/base/resource/resource_bundle.h" 32 #include "ui/base/resource/resource_bundle.h"
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 636
636 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) { 637 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) {
637 tray::NetworkMessages::MessageMap::const_iterator iter = 638 tray::NetworkMessages::MessageMap::const_iterator iter =
638 messages()->messages().find(message_type); 639 messages()->messages().find(message_type);
639 if (iter != messages()->messages().end() && iter->second.delegate) 640 if (iter != messages()->messages().end() && iter->second.delegate)
640 iter->second.delegate->NotificationLinkClicked(message_type, link_id); 641 iter->second.delegate->NotificationLinkClicked(message_type, link_id);
641 } 642 }
642 643
643 } // namespace internal 644 } // namespace internal
644 } // namespace ash 645 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698