Commit 4664c32a authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Only show quit instruction bubble on browser windows

The new instruction bubble's recommendation to "press Alt+F" won't work on
non-browser windows, so don't show the instructions unless the focused window is
a browser window and has a toolbar.

BUG=243164
R=sky

Change-Id: I1ab550ff57134009a2cbb0a1ee612775c1323e88
Reviewed-on: https://chromium-review.googlesource.com/1197343Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587787}
parent 1c7e1956
...@@ -1180,8 +1180,10 @@ void BrowserView::RotatePaneFocus(bool forwards) { ...@@ -1180,8 +1180,10 @@ void BrowserView::RotatePaneFocus(bool forwards) {
void BrowserView::DestroyBrowser() { void BrowserView::DestroyBrowser() {
#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
GetWidget()->GetNativeView()->RemovePreTargetHandler( if (browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR)) {
QuitInstructionBubbleController::GetInstance()); GetWidget()->GetNativeView()->RemovePreTargetHandler(
QuitInstructionBubbleController::GetInstance());
}
#endif #endif
// After this returns other parts of Chrome are going to be shutdown. Close // After this returns other parts of Chrome are going to be shutdown. Close
...@@ -2299,8 +2301,10 @@ void BrowserView::InitViews() { ...@@ -2299,8 +2301,10 @@ void BrowserView::InitViews() {
browser_->profile()); browser_->profile());
#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
GetWidget()->GetNativeView()->AddPreTargetHandler( if (browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR)) {
QuitInstructionBubbleController::GetInstance()); GetWidget()->GetNativeView()->AddPreTargetHandler(
QuitInstructionBubbleController::GetInstance());
}
#endif #endif
#if defined(USE_AURA) #if defined(USE_AURA)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment