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

Unified Diff: chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc

Issue 11416292: Revert 170477 - Removes the |event| parameter from ActivationDelegate::ShouldActivate and makes the… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « ash/wm/activation_controller.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc
===================================================================
--- chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc (revision 170548)
+++ chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc (working copy)
@@ -159,7 +159,7 @@
}
// aura::client::ActivationDelegate overrides.
- virtual bool ShouldActivate() const OVERRIDE {
+ virtual bool ShouldActivate(const ui::Event* event) OVERRIDE {
return true;
}
virtual void OnActivated() OVERRIDE {
« no previous file with comments | « ash/wm/activation_controller.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698