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

Side by Side Diff: ash/system/overview/overview_button_tray.cc

Issue 1918183003: mash: Close the system tray bubble on click outside its bounds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pointerwatcher
Patch Set: rebase Created 4 years, 7 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/overview/overview_button_tray.h ('k') | ash/system/tray/system_tray.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/overview/overview_button_tray.h" 5 #include "ash/system/overview/overview_button_tray.h"
6 6
7 #include "ash/session/session_state_delegate.h" 7 #include "ash/session/session_state_delegate.h"
8 #include "ash/shelf/shelf_types.h" 8 #include "ash/shelf/shelf_types.h"
9 #include "ash/shelf/shelf_util.h" 9 #include "ash/shelf/shelf_util.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 } 77 }
78 78
79 void OverviewButtonTray::OnMaximizeModeEnded() { 79 void OverviewButtonTray::OnMaximizeModeEnded() {
80 UpdateIconVisibility(); 80 UpdateIconVisibility();
81 } 81 }
82 82
83 void OverviewButtonTray::OnOverviewModeEnded() { 83 void OverviewButtonTray::OnOverviewModeEnded() {
84 SetDrawBackgroundAsActive(false); 84 SetDrawBackgroundAsActive(false);
85 } 85 }
86 86
87 bool OverviewButtonTray::ClickedOutsideBubble() { 87 void OverviewButtonTray::ClickedOutsideBubble() {}
88 // This class has no bubbles dismiss, but acknowledge that the message was
89 // handled.
90 return true;
91 }
92 88
93 base::string16 OverviewButtonTray::GetAccessibleNameForTray() { 89 base::string16 OverviewButtonTray::GetAccessibleNameForTray() {
94 return l10n_util::GetStringUTF16(IDS_ASH_OVERVIEW_BUTTON_ACCESSIBLE_NAME); 90 return l10n_util::GetStringUTF16(IDS_ASH_OVERVIEW_BUTTON_ACCESSIBLE_NAME);
95 } 91 }
96 92
97 void OverviewButtonTray::HideBubbleWithView( 93 void OverviewButtonTray::HideBubbleWithView(
98 const views::TrayBubbleView* bubble_view) { 94 const views::TrayBubbleView* bubble_view) {
99 // This class has no bubbles to hide. 95 // This class has no bubbles to hide.
100 } 96 }
101 97
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && 132 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
137 session_state_delegate->IsActiveUserSessionStarted() && 133 session_state_delegate->IsActiveUserSessionStarted() &&
138 !session_state_delegate->IsScreenLocked() && 134 !session_state_delegate->IsScreenLocked() &&
139 session_state_delegate->GetSessionState() == 135 session_state_delegate->GetSessionState() ==
140 SessionStateDelegate::SESSION_STATE_ACTIVE && 136 SessionStateDelegate::SESSION_STATE_ACTIVE &&
141 shell->system_tray_delegate()->GetUserLoginStatus() != 137 shell->system_tray_delegate()->GetUserLoginStatus() !=
142 user::LOGGED_IN_KIOSK_APP); 138 user::LOGGED_IN_KIOSK_APP);
143 } 139 }
144 140
145 } // namespace ash 141 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/overview/overview_button_tray.h ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698