| Index: ash/common/system/chromeos/tray_tracing.cc
|
| diff --git a/ash/common/system/chromeos/tray_tracing.cc b/ash/common/system/chromeos/tray_tracing.cc
|
| index e1ac45f5d5a4814487c187c1867c9a67670eb65a..87bccb4a02cf1ad16daf3f567751effe333e4d79 100644
|
| --- a/ash/common/system/chromeos/tray_tracing.cc
|
| +++ b/ash/common/system/chromeos/tray_tracing.cc
|
| @@ -28,7 +28,7 @@ namespace tray {
|
|
|
| class DefaultTracingView : public ActionableView {
|
| public:
|
| - DefaultTracingView() {
|
| + explicit DefaultTracingView(SystemTrayItem* owner) : ActionableView(owner) {
|
| SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
|
| kTrayPopupPaddingHorizontal, 0,
|
| kTrayPopupPaddingBetweenItems));
|
| @@ -62,6 +62,7 @@ class DefaultTracingView : public ActionableView {
|
| WmShell::Get()->RecordUserMetricsAction(
|
| UMA_STATUS_AREA_TRACING_DEFAULT_SELECTED);
|
| WmShell::Get()->system_tray_delegate()->ShowChromeSlow();
|
| + CloseSystemBubble();
|
| return true;
|
| }
|
|
|
| @@ -99,7 +100,7 @@ bool TrayTracing::GetInitialVisibility() {
|
| views::View* TrayTracing::CreateDefaultView(LoginStatus status) {
|
| CHECK(default_ == NULL);
|
| if (tray_view() && tray_view()->visible())
|
| - default_ = new tray::DefaultTracingView();
|
| + default_ = new tray::DefaultTracingView(this);
|
| return default_;
|
| }
|
|
|
|
|