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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

Issue 12096047: mac: Delete GetCachedImageWithName(), it's no longer used. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: includes Created 7 years, 10 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 #import "browser_actions_controller.h" 5 #import "browser_actions_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <string> 8 #include <string>
9 9
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/ui/tabs/tab_strip_model.h" 26 #include "chrome/browser/ui/tabs/tab_strip_model.h"
27 #include "chrome/common/chrome_notification_types.h" 27 #include "chrome/common/chrome_notification_types.h"
28 #include "chrome/common/extensions/api/extension_action/action_info.h" 28 #include "chrome/common/extensions/api/extension_action/action_info.h"
29 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "content/public/browser/notification_observer.h" 30 #include "content/public/browser/notification_observer.h"
31 #include "content/public/browser/notification_registrar.h" 31 #include "content/public/browser/notification_registrar.h"
32 #include "content/public/browser/notification_details.h" 32 #include "content/public/browser/notification_details.h"
33 #include "content/public/browser/notification_source.h" 33 #include "content/public/browser/notification_source.h"
34 #include "grit/theme_resources.h" 34 #include "grit/theme_resources.h"
35 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 35 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
36 #include "ui/gfx/mac/nsimage_cache.h"
37 36
38 using extensions::Extension; 37 using extensions::Extension;
39 using extensions::ExtensionList; 38 using extensions::ExtensionList;
40 39
41 NSString* const kBrowserActionVisibilityChangedNotification = 40 NSString* const kBrowserActionVisibilityChangedNotification =
42 @"BrowserActionVisibilityChangedNotification"; 41 @"BrowserActionVisibilityChangedNotification";
43 42
44 namespace { 43 namespace {
45 const CGFloat kAnimationDuration = 0.2; 44 const CGFloat kAnimationDuration = 0.2;
46 45
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 const extensions::ExtensionList& toolbar_items = 870 const extensions::ExtensionList& toolbar_items =
872 toolbarModel_->toolbar_items(); 871 toolbarModel_->toolbar_items();
873 if (index < toolbar_items.size()) { 872 if (index < toolbar_items.size()) {
874 const Extension* extension = toolbar_items[index]; 873 const Extension* extension = toolbar_items[index];
875 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; 874 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
876 } 875 }
877 return nil; 876 return nil;
878 } 877 }
879 878
880 @end 879 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser/avatar_button_controller.mm ('k') | chrome/browser/ui/cocoa/history_menu_bridge.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698