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

Unified Diff: chrome/browser/ui/views/profiles/profile_chooser_view.h

Issue 682113002: Fix accelerators in avatar gaia webview on mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more nits fixed 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
Index: chrome/browser/ui/views/profiles/profile_chooser_view.h
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.h b/chrome/browser/ui/views/profiles/profile_chooser_view.h
index c477bf74ecd6cd56f636c926022fe70202ef1722..263b4a6d5d59d5d3fcbde0d56882c5ac9ef7a54b 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.h
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.h
@@ -13,6 +13,7 @@
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/profile_chooser_constants.h"
+#include "content/public/browser/web_contents_delegate.h"
#include "google_apis/gaia/oauth2_token_service.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/controls/button/button.h"
@@ -38,7 +39,8 @@ class Browser;
// This bubble view is displayed when the user clicks on the avatar button.
// It displays a list of profiles and allows users to switch between profiles.
-class ProfileChooserView : public views::BubbleDelegateView,
+class ProfileChooserView : public content::WebContentsDelegate,
+ public views::BubbleDelegateView,
public views::ButtonListener,
public views::LinkListener,
public views::StyledLabelListener,
@@ -90,6 +92,9 @@ class ProfileChooserView : public views::BubbleDelegateView,
virtual void WindowClosing() override;
virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+ // content::WebContentsDelegate.
Alexei Svitkine (slow) 2014/10/28 18:58:42 Nit: . -> :
guohui 2014/10/28 19:02:39 Done.
+ bool HandleContextMenu(const content::ContextMenuParams& params) override;
+
// views::ButtonListener:
virtual void ButtonPressed(views::Button* sender,
const ui::Event& event) override;

Powered by Google App Engine
This is Rietveld 408576698