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

Side by Side Diff: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

Issue 10834106: Implement Keybinding for script badges. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h" 5 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 case chrome::NOTIFICATION_WINDOW_CLOSED: 203 case chrome::NOTIFICATION_WINDOW_CLOSED:
204 DisconnectBrowserActionPopupAccelerator(); 204 DisconnectBrowserActionPopupAccelerator();
205 break; 205 break;
206 case chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED: 206 case chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED:
207 case chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED: { 207 case chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED: {
208 std::pair<const std::string, const std::string>* payload = 208 std::pair<const std::string, const std::string>* payload =
209 content::Details<std::pair<const std::string, const std::string> >( 209 content::Details<std::pair<const std::string, const std::string> >(
210 details).ptr(); 210 details).ptr();
211 if (extension_->id() == payload->first && 211 if (extension_->id() == payload->first &&
212 payload->second == 212 payload->second ==
213 extension_manifest_values::kBrowserActionKeybindingEvent) { 213 extension_manifest_values::kBrowserActionCommandEvent) {
214 if (type == chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED) 214 if (type == chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED)
215 ConnectBrowserActionPopupAccelerator(); 215 ConnectBrowserActionPopupAccelerator();
216 else 216 else
217 DisconnectBrowserActionPopupAccelerator(); 217 DisconnectBrowserActionPopupAccelerator();
218 } 218 }
219 break; 219 break;
220 } 220 }
221 default: 221 default:
222 NOTREACHED(); 222 NOTREACHED();
223 break; 223 break;
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 1114
1115 menu->PopupAsContext(gfx::Point(event->x_root, event->y_root), 1115 menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
1116 event->time); 1116 event->time);
1117 return TRUE; 1117 return TRUE;
1118 } 1118 }
1119 1119
1120 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) { 1120 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
1121 if (!resize_animation_.is_animating()) 1121 if (!resize_animation_.is_animating())
1122 UpdateChevronVisibility(); 1122 UpdateChevronVisibility();
1123 } 1123 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698