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

Side by Side Diff: ash/system/network/network_list.cc

Issue 2913103002: Add Tether to Mobile NetworkTypePattern. (Closed)
Patch Set: Add Tether to Mobile NetworkTypePattern. Created 3 years, 6 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/network/network_icon.cc ('k') | chrome/browser/chromeos/status/network_menu.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/network/network_list.h" 5 #include "ash/system/network/network_list.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_port.h" 10 #include "ash/shell_port.h"
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 index += new_guids->size(); 516 index += new_guids->size();
517 517
518 if (handler->IsTechnologyAvailable(NetworkTypePattern::Cellular())) { 518 if (handler->IsTechnologyAvailable(NetworkTypePattern::Cellular())) {
519 index = UpdateSectionHeaderRow( 519 index = UpdateSectionHeaderRow(
520 NetworkTypePattern::Cellular(), 520 NetworkTypePattern::Cellular(),
521 handler->IsTechnologyEnabled(NetworkTypePattern::Cellular()), index, 521 handler->IsTechnologyEnabled(NetworkTypePattern::Cellular()), index,
522 &cellular_header_view_, &cellular_separator_view_); 522 &cellular_header_view_, &cellular_separator_view_);
523 } 523 }
524 524
525 // Cellular initializing. 525 // Cellular initializing.
526 int cellular_message_id = network_icon::GetCellularUninitializedMsg(); 526 int cellular_message_id = network_icon::GetMobileUninitializedMsg();
527 if (!cellular_message_id && 527 if (!cellular_message_id &&
528 handler->IsTechnologyEnabled(NetworkTypePattern::Mobile()) && 528 handler->IsTechnologyEnabled(NetworkTypePattern::Mobile()) &&
529 !handler->FirstNetworkByType(NetworkTypePattern::Mobile())) { 529 !handler->FirstNetworkByType(NetworkTypePattern::Mobile())) {
530 cellular_message_id = IDS_ASH_STATUS_TRAY_NO_MOBILE_NETWORKS; 530 cellular_message_id = IDS_ASH_STATUS_TRAY_NO_MOBILE_NETWORKS;
531 } 531 }
532 UpdateInfoLabel(cellular_message_id, index, &no_cellular_networks_view_); 532 UpdateInfoLabel(cellular_message_id, index, &no_cellular_networks_view_);
533 if (cellular_message_id) 533 if (cellular_message_id)
534 ++index; 534 ++index;
535 535
536 // Add cellular networks. 536 // Add cellular networks.
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 TriView::Container::CENTER, views::CreateEmptyBorder(gfx::Insets( 761 TriView::Container::CENTER, views::CreateEmptyBorder(gfx::Insets(
762 0, 0, 0, kTrayPopupLabelRightPadding))); 762 0, 0, 0, kTrayPopupLabelRightPadding)));
763 763
764 // Nothing to the right of the text. 764 // Nothing to the right of the text.
765 connection_warning->SetContainerVisible(TriView::Container::END, false); 765 connection_warning->SetContainerVisible(TriView::Container::END, false);
766 return connection_warning; 766 return connection_warning;
767 } 767 }
768 768
769 } // namespace tray 769 } // namespace tray
770 } // namespace ash 770 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/network/network_icon.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698