Chromium Code Reviews| 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/extension_action.h" | 9 #include "chrome/browser/extensions/extension_action.h" |
| 10 #include "chrome/browser/extensions/extension_action_manager.h" | 10 #include "chrome/browser/extensions/extension_action_manager.h" |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 400 extensions::CommandService* command_service = | 400 extensions::CommandService* command_service = |
| 401 extensions::CommandService::Get(browser_->profile()); | 401 extensions::CommandService::Get(browser_->profile()); |
| 402 | 402 |
| 403 extensions::Command browser_action_command; | 403 extensions::Command browser_action_command; |
| 404 if (!only_if_active || !command_service->GetBrowserActionCommand( | 404 if (!only_if_active || !command_service->GetBrowserActionCommand( |
| 405 extension_->id(), | 405 extension_->id(), |
| 406 extensions::CommandService::ACTIVE_ONLY, | 406 extensions::CommandService::ACTIVE_ONLY, |
| 407 &browser_action_command, | 407 &browser_action_command, |
| 408 NULL)) { | 408 NULL)) { |
| 409 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); | 409 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); |
| 410 keybinding_.reset(NULL); | |
|
Yoyo Zhou
2013/05/06 18:47:58
Why is this views-only?
Finnur
2013/05/06 23:13:54
Good question. This was something I discovered by
| |
| 410 } | 411 } |
| 411 } | 412 } |
| OLD | NEW |