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

Unified Diff: chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm

Issue 2017813004: Added popup that shows the new Back shortcut on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@backspace-new-shortcut-bubble
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm
diff --git a/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm b/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm
index 50a20aac825e71c135ab527dbcffca2214922fe8..df37742bb1fe7934cf430f1c9d62a1745d12e123 100644
--- a/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm
+++ b/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm
@@ -13,6 +13,7 @@
#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
#include "chrome/browser/ui/status_bubble.h"
#include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
+#include "chrome/browser/ui/views/new_back_shortcut_bubble.h"
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
#include "ui/base/cocoa/cocoa_base_utils.h"
@@ -50,6 +51,13 @@ void ExclusiveAccessController::Show() {
[cocoa_bubble_ showWindow];
}
+void ExclusiveAccessController::ShowNewBackShortcutBubble(bool forward) {
+ if (new_back_shortcut_bubble_)
+ new_back_shortcut_bubble_->UpdateContent(forward);
+ else
+ new_back_shortcut_bubble_.reset(new NewBackShortcutBubble(this, forward));
+}
+
void ExclusiveAccessController::Destroy() {
views_bubble_.reset();
[cocoa_bubble_ closeImmediately];
« no previous file with comments | « chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698