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

Side by Side Diff: chrome/browser/ui/views/browser_action_view.cc

Issue 10855154: Update browserAction.setIcon and pageAction.setIcon for hidpi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits 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/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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 413
414 extensions::Command browser_action_command; 414 extensions::Command browser_action_command;
415 if (!only_if_active || !command_service->GetBrowserActionCommand( 415 if (!only_if_active || !command_service->GetBrowserActionCommand(
416 extension_->id(), 416 extension_->id(),
417 extensions::CommandService::ACTIVE_ONLY, 417 extensions::CommandService::ACTIVE_ONLY,
418 &browser_action_command, 418 &browser_action_command,
419 NULL)) { 419 NULL)) {
420 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); 420 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
421 } 421 }
422 } 422 }
423
424 gfx::Image BrowserActionButton::GetIconForTest() {
Jeffrey Yasskin 2012/08/17 23:20:28 Probably return the same type as icon(), since I d
tbarzic 2012/08/21 00:22:07 Done.
425 return gfx::Image(icon());
426 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698