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

Unified Diff: athena/system/status_icon_container_view.cc

Issue 662763002: Support modal windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: fix leaks 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 | « athena/system/status_icon_container_view.h ('k') | athena/system/system_ui_impl.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..a7c5f85b98b92ed039cb7de17a037fb46c501a13 100644
--- a/athena/system/status_icon_container_view.cc
+++ b/athena/system/status_icon_container_view.cc
@@ -208,9 +208,7 @@ class StatusIconContainerView::UpdateStatus
};
StatusIconContainerView::StatusIconContainerView(
- SystemUI::ColorScheme color_scheme,
- aura::Window* system_modal_container)
- : system_modal_container_(system_modal_container) {
+ SystemUI::ColorScheme color_scheme) {
const int kHorizontalSpacing = 10;
const int kVerticalSpacing = 3;
const int kBetweenChildSpacing = 10;
@@ -241,13 +239,13 @@ StatusIconContainerView::~StatusIconContainerView() {
}
bool StatusIconContainerView::OnMousePressed(const ui::MouseEvent& event) {
- CreateNetworkSelector(system_modal_container_);
+ CreateNetworkSelector();
return true;
}
void StatusIconContainerView::OnGestureEvent(ui::GestureEvent* event) {
if (event->type() == ui::ET_GESTURE_TAP) {
- CreateNetworkSelector(system_modal_container_);
+ CreateNetworkSelector();
event->SetHandled();
}
}
« no previous file with comments | « athena/system/status_icon_container_view.h ('k') | athena/system/system_ui_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698