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

Side by Side Diff: ui/chromeos/network/network_icon.cc

Issue 351353004: chromeos: Move some network related UI in ui/chromeos/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-build 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
« no previous file with comments | « ui/chromeos/network/network_icon.h ('k') | ui/chromeos/network/network_icon_animation.h » ('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/network_icon.h" 5 #include "ui/chromeos/network/network_icon.h"
6 6
7 #include "ash/system/chromeos/network/network_icon_animation.h"
8 #include "ash/system/chromeos/network/network_icon_animation_observer.h"
9 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
10 #include "chromeos/network/device_state.h" 8 #include "chromeos/network/device_state.h"
11 #include "chromeos/network/network_connection_handler.h" 9 #include "chromeos/network/network_connection_handler.h"
12 #include "chromeos/network/network_state.h" 10 #include "chromeos/network/network_state.h"
13 #include "chromeos/network/network_state_handler.h" 11 #include "chromeos/network/network_state_handler.h"
14 #include "chromeos/network/portal_detector/network_portal_detector.h" 12 #include "chromeos/network/portal_detector/network_portal_detector.h"
15 #include "grit/ash_resources.h" 13 #include "grit/ui_chromeos_resources.h"
16 #include "grit/ash_strings.h" 14 #include "grit/ui_chromeos_strings.h"
17 #include "third_party/cros_system_api/dbus/service_constants.h" 15 #include "third_party/cros_system_api/dbus/service_constants.h"
18 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/base/webui/web_ui_util.h" 18 #include "ui/base/webui/web_ui_util.h"
19 #include "ui/chromeos/network/network_icon_animation.h"
20 #include "ui/chromeos/network/network_icon_animation_observer.h"
21 #include "ui/gfx/canvas.h" 21 #include "ui/gfx/canvas.h"
22 #include "ui/gfx/image/image_skia_operations.h" 22 #include "ui/gfx/image/image_skia_operations.h"
23 #include "ui/gfx/image/image_skia_source.h" 23 #include "ui/gfx/image/image_skia_source.h"
24 #include "ui/gfx/rect.h" 24 #include "ui/gfx/rect.h"
25 #include "ui/gfx/size_conversions.h" 25 #include "ui/gfx/size_conversions.h"
26 26
27 using chromeos::DeviceState; 27 using chromeos::DeviceState;
28 using chromeos::NetworkConnectionHandler; 28 using chromeos::NetworkConnectionHandler;
29 using chromeos::NetworkHandler; 29 using chromeos::NetworkHandler;
30 using chromeos::NetworkPortalDetector; 30 using chromeos::NetworkPortalDetector;
31 using chromeos::NetworkState; 31 using chromeos::NetworkState;
32 using chromeos::NetworkStateHandler; 32 using chromeos::NetworkStateHandler;
33 using chromeos::NetworkTypePattern; 33 using chromeos::NetworkTypePattern;
34 34
35 namespace ash { 35 namespace ui {
36 namespace network_icon { 36 namespace network_icon {
37 37
38 namespace { 38 namespace {
39 39
40 //------------------------------------------------------------------------------ 40 //------------------------------------------------------------------------------
41 // Struct to pass icon badges to NetworkIconImageSource. 41 // Struct to pass icon badges to NetworkIconImageSource.
42 struct Badges { 42 struct Badges {
43 Badges() 43 Badges()
44 : top_left(NULL), 44 : top_left(NULL),
45 top_right(NULL), 45 top_right(NULL),
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 for (NetworkStateHandler::NetworkStateList::iterator iter = networks.begin(); 952 for (NetworkStateHandler::NetworkStateList::iterator iter = networks.begin();
953 iter != networks.end(); ++iter) { 953 iter != networks.end(); ++iter) {
954 network_paths.insert((*iter)->path()); 954 network_paths.insert((*iter)->path());
955 } 955 }
956 PurgeIconMap(ICON_TYPE_TRAY, network_paths); 956 PurgeIconMap(ICON_TYPE_TRAY, network_paths);
957 PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths); 957 PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);
958 PurgeIconMap(ICON_TYPE_LIST, network_paths); 958 PurgeIconMap(ICON_TYPE_LIST, network_paths);
959 } 959 }
960 960
961 } // namespace network_icon 961 } // namespace network_icon
962 } // namespace ash 962 } // namespace ui
OLDNEW
« no previous file with comments | « ui/chromeos/network/network_icon.h ('k') | ui/chromeos/network/network_icon_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698