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

Unified Diff: athena/system/status_icon_container_view.cc

Issue 653853004: athena: Avoid initializaing chromeos::Network for tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | athena/test/base/athena_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/system/status_icon_container_view.cc
diff --git a/athena/system/status_icon_container_view.cc b/athena/system/status_icon_container_view.cc
index 811c645cfa8d3a6e11953c1ba0f48d2bd54ea977..c93469f225be77a0c8eb08ae13f615a497d3db99 100644
--- a/athena/system/status_icon_container_view.cc
+++ b/athena/system/status_icon_container_view.cc
@@ -226,7 +226,8 @@ StatusIconContainerView::StatusIconContainerView(
AddChildView(CreateLabel(color_scheme, "Network:"));
views::Label* network_label = CreateLabel(color_scheme, std::string());
AddChildView(network_label);
- network_status_.reset(new NetworkStatus(network_label));
+ if (chromeos::NetworkHandler::IsInitialized())
+ network_status_.reset(new NetworkStatus(network_label));
views::ImageView* battery_view = new views::ImageView();
AddChildView(battery_view);
« no previous file with comments | « no previous file | athena/test/base/athena_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698