| 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" | |
| 10 #include "chrome/browser/extensions/extension_action.h" | 9 #include "chrome/browser/extensions/extension_action.h" |
| 11 #include "chrome/browser/extensions/extension_action_manager.h" | 10 #include "chrome/browser/extensions/extension_action_manager.h" |
| 12 #include "chrome/browser/extensions/extension_context_menu_model.h" | 11 #include "chrome/browser/extensions/extension_context_menu_model.h" |
| 13 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/views/browser_actions_container.h" | 13 #include "chrome/browser/ui/views/browser_actions_container.h" |
| 15 #include "chrome/browser/ui/views/toolbar_view.h" | 14 #include "chrome/browser/ui/views/toolbar_view.h" |
| 16 #include "chrome/common/chrome_notification_types.h" | 15 #include "chrome/common/chrome_notification_types.h" |
| 17 #include "chrome/common/extensions/extension.h" | 16 #include "chrome/common/extensions/extension.h" |
| 18 #include "chrome/common/extensions/extension_manifest_constants.h" | 17 #include "chrome/common/extensions/extension_manifest_constants.h" |
| 19 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" |
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 | 373 |
| 375 gfx::ImageSkia BrowserActionButton::GetIconForTest() { | 374 gfx::ImageSkia BrowserActionButton::GetIconForTest() { |
| 376 return icon(); | 375 return icon(); |
| 377 } | 376 } |
| 378 | 377 |
| 379 BrowserActionButton::~BrowserActionButton() { | 378 BrowserActionButton::~BrowserActionButton() { |
| 380 } | 379 } |
| 381 | 380 |
| 382 void BrowserActionButton::MaybeRegisterExtensionCommand() { | 381 void BrowserActionButton::MaybeRegisterExtensionCommand() { |
| 383 extensions::CommandService* command_service = | 382 extensions::CommandService* command_service = |
| 384 extensions::CommandServiceFactory::GetForProfile(browser_->profile()); | 383 extensions::CommandService::Get(browser_->profile()); |
| 385 extensions::Command browser_action_command; | 384 extensions::Command browser_action_command; |
| 386 if (command_service->GetBrowserActionCommand( | 385 if (command_service->GetBrowserActionCommand( |
| 387 extension_->id(), | 386 extension_->id(), |
| 388 extensions::CommandService::ACTIVE_ONLY, | 387 extensions::CommandService::ACTIVE_ONLY, |
| 389 &browser_action_command, | 388 &browser_action_command, |
| 390 NULL)) { | 389 NULL)) { |
| 391 keybinding_.reset(new ui::Accelerator( | 390 keybinding_.reset(new ui::Accelerator( |
| 392 browser_action_command.accelerator())); | 391 browser_action_command.accelerator())); |
| 393 GetFocusManager()->RegisterAccelerator( | 392 GetFocusManager()->RegisterAccelerator( |
| 394 *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this); | 393 *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this); |
| 395 } | 394 } |
| 396 } | 395 } |
| 397 | 396 |
| 398 void BrowserActionButton::MaybeUnregisterExtensionCommand(bool only_if_active) { | 397 void BrowserActionButton::MaybeUnregisterExtensionCommand(bool only_if_active) { |
| 399 if (!keybinding_.get() || !GetFocusManager()) | 398 if (!keybinding_.get() || !GetFocusManager()) |
| 400 return; | 399 return; |
| 401 | 400 |
| 402 extensions::CommandService* command_service = | 401 extensions::CommandService* command_service = |
| 403 extensions::CommandServiceFactory::GetForProfile(browser_->profile()); | 402 extensions::CommandService::Get(browser_->profile()); |
| 404 | 403 |
| 405 extensions::Command browser_action_command; | 404 extensions::Command browser_action_command; |
| 406 if (!only_if_active || !command_service->GetBrowserActionCommand( | 405 if (!only_if_active || !command_service->GetBrowserActionCommand( |
| 407 extension_->id(), | 406 extension_->id(), |
| 408 extensions::CommandService::ACTIVE_ONLY, | 407 extensions::CommandService::ACTIVE_ONLY, |
| 409 &browser_action_command, | 408 &browser_action_command, |
| 410 NULL)) { | 409 NULL)) { |
| 411 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); | 410 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); |
| 412 } | 411 } |
| 413 } | 412 } |
| OLD | NEW |