Chromium Code Reviews Chromium Code Reviews
Issue 10855154:
Update browserAction.setIcon and pageAction.setIcon for hidpi (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| 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 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 406 | 406 |
| 407 extensions::Command browser_action_command; | 407 extensions::Command browser_action_command; |
| 408 if (!only_if_active || !command_service->GetBrowserActionCommand( | 408 if (!only_if_active || !command_service->GetBrowserActionCommand( |
| 409 extension_->id(), | 409 extension_->id(), |
| 410 extensions::CommandService::ACTIVE_ONLY, | 410 extensions::CommandService::ACTIVE_ONLY, |
| 411 &browser_action_command, | 411 &browser_action_command, |
| 412 NULL)) { | 412 NULL)) { |
| 413 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); | 413 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); |
| 414 } | 414 } |
| 415 } | 415 } |
| 416 | |
| 417 gfx::ImageSkia BrowserActionButton::GetIconForTest() { | |
|
sky
2012/08/31 19:35:12
Make position match header.
| |
| 418 return icon(); | |
| 419 } | |
| OLD | NEW |
