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 #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" |
11 #include "chrome/browser/extensions/extension_service.h" | 11 #include "chrome/browser/extensions/extension_service.h" |
12 #include "chrome/browser/extensions/extension_toolbar_model.h" | 12 #include "chrome/browser/extensions/extension_toolbar_model.h" |
13 #include "chrome/browser/prefs/pref_service.h" | 13 #include "chrome/browser/prefs/pref_service.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/sessions/session_tab_helper.h" | 15 #include "chrome/browser/sessions/session_tab_helper.h" |
16 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/browser_tabstrip.h" | 17 #include "chrome/browser/ui/browser_tabstrip.h" |
18 #include "chrome/browser/ui/browser_window.h" | 18 #include "chrome/browser/ui/browser_window.h" |
19 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 19 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" |
20 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" | 20 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" |
21 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" | 21 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" |
22 #import "chrome/browser/ui/cocoa/image_button_cell.h" | 22 #import "chrome/browser/ui/cocoa/image_button_cell.h" |
23 #import "chrome/browser/ui/cocoa/menu_button.h" | 23 #import "chrome/browser/ui/cocoa/menu_button.h" |
24 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 24 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
25 #include "chrome/common/chrome_notification_types.h" | 25 #include "chrome/common/chrome_notification_types.h" |
26 #include "chrome/common/extensions/extension_action.h" | 26 #include "chrome/browser/extensions/extension_action.h" |
Jeffrey Yasskin
2012/09/14 19:18:33
I haven't re-sorted all the includes yet.
| |
27 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
28 #include "content/public/browser/notification_observer.h" | 28 #include "content/public/browser/notification_observer.h" |
29 #include "content/public/browser/notification_registrar.h" | 29 #include "content/public/browser/notification_registrar.h" |
30 #include "content/public/browser/notification_details.h" | 30 #include "content/public/browser/notification_details.h" |
31 #include "content/public/browser/notification_source.h" | 31 #include "content/public/browser/notification_source.h" |
32 #include "grit/theme_resources.h" | 32 #include "grit/theme_resources.h" |
33 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" | 33 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" |
34 #include "ui/gfx/mac/nsimage_cache.h" | 34 #include "ui/gfx/mac/nsimage_cache.h" |
35 | 35 |
36 using extensions::Extension; | 36 using extensions::Extension; |
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
863 const extensions::ExtensionList& toolbar_items = | 863 const extensions::ExtensionList& toolbar_items = |
864 toolbarModel_->toolbar_items(); | 864 toolbarModel_->toolbar_items(); |
865 if (index < toolbar_items.size()) { | 865 if (index < toolbar_items.size()) { |
866 const Extension* extension = toolbar_items[index]; | 866 const Extension* extension = toolbar_items[index]; |
867 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; | 867 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; |
868 } | 868 } |
869 return nil; | 869 return nil; |
870 } | 870 } |
871 | 871 |
872 @end | 872 @end |
OLD | NEW |