OLD | NEW |
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/views/browser_action_view.h" | 5 #include "chrome/browser/ui/views/browser_action_view.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/extensions/api/commands/command_service.h" | 8 #include "chrome/browser/extensions/api/commands/command_service.h" |
9 #include "chrome/browser/extensions/api/commands/command_service_factory.h" | 9 #include "chrome/browser/extensions/api/commands/command_service_factory.h" |
10 #include "chrome/browser/extensions/extension_context_menu_model.h" | 10 #include "chrome/browser/extensions/extension_context_menu_model.h" |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 // sure the state gets updated. | 241 // sure the state gets updated. |
242 panel_->OnBrowserActionVisibilityChanged(); | 242 panel_->OnBrowserActionVisibilityChanged(); |
243 break; | 243 break; |
244 case chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED: | 244 case chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED: |
245 case chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED: { | 245 case chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED: { |
246 std::pair<const std::string, const std::string>* payload = | 246 std::pair<const std::string, const std::string>* payload = |
247 content::Details<std::pair<const std::string, const std::string> >( | 247 content::Details<std::pair<const std::string, const std::string> >( |
248 details).ptr(); | 248 details).ptr(); |
249 if (extension_->id() == payload->first && | 249 if (extension_->id() == payload->first && |
250 payload->second == | 250 payload->second == |
251 extension_manifest_values::kBrowserActionKeybindingEvent) { | 251 extension_manifest_values::kBrowserActionCommandEvent) { |
252 if (type == chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED) | 252 if (type == chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED) |
253 MaybeRegisterExtensionCommand(); | 253 MaybeRegisterExtensionCommand(); |
254 else | 254 else |
255 MaybeUnregisterExtensionCommand(true); | 255 MaybeUnregisterExtensionCommand(true); |
256 } | 256 } |
257 break; | 257 break; |
258 } | 258 } |
259 default: | 259 default: |
260 NOTREACHED(); | 260 NOTREACHED(); |
261 break; | 261 break; |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
429 state->role = ui::AccessibilityTypes::ROLE_GROUPING; | 429 state->role = ui::AccessibilityTypes::ROLE_GROUPING; |
430 } | 430 } |
431 | 431 |
432 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) { | 432 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) { |
433 View::PaintChildren(canvas); | 433 View::PaintChildren(canvas); |
434 ExtensionAction* action = button()->browser_action(); | 434 ExtensionAction* action = button()->browser_action(); |
435 int tab_id = panel_->GetCurrentTabId(); | 435 int tab_id = panel_->GetCurrentTabId(); |
436 if (tab_id >= 0) | 436 if (tab_id >= 0) |
437 action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id); | 437 action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id); |
438 } | 438 } |
OLD | NEW |