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

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

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 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/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
12 #include "chrome/browser/extensions/extension_action.h" 12 #include "chrome/browser/extensions/extension_action.h"
13 #include "chrome/browser/extensions/extension_action_manager.h" 13 #include "chrome/browser/extensions/extension_action_manager.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/extensions/extension_system.h" 15 #include "chrome/browser/extensions/extension_system.h"
16 #include "chrome/browser/extensions/extension_toolbar_model.h" 16 #include "chrome/browser/extensions/extension_toolbar_model.h"
17 #include "chrome/browser/prefs/pref_registry_syncable.h"
18 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/sessions/session_tab_helper.h" 18 #include "chrome/browser/sessions/session_tab_helper.h"
20 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/browser_window.h" 20 #include "chrome/browser/ui/browser_window.h"
22 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 21 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
23 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" 22 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
24 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" 23 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
25 #import "chrome/browser/ui/cocoa/image_button_cell.h" 24 #import "chrome/browser/ui/cocoa/image_button_cell.h"
26 #import "chrome/browser/ui/cocoa/menu_button.h" 25 #import "chrome/browser/ui/cocoa/menu_button.h"
27 #include "chrome/browser/ui/tabs/tab_strip_model.h" 26 #include "chrome/browser/ui/tabs/tab_strip_model.h"
28 #include "chrome/common/chrome_notification_types.h" 27 #include "chrome/common/chrome_notification_types.h"
29 #include "chrome/common/extensions/api/extension_action/action_info.h" 28 #include "chrome/common/extensions/api/extension_action/action_info.h"
30 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "components/user_prefs/pref_registry_syncable.h"
31 #include "content/public/browser/notification_details.h" 31 #include "content/public/browser/notification_details.h"
32 #include "content/public/browser/notification_observer.h" 32 #include "content/public/browser/notification_observer.h"
33 #include "content/public/browser/notification_registrar.h" 33 #include "content/public/browser/notification_registrar.h"
34 #include "content/public/browser/notification_source.h" 34 #include "content/public/browser/notification_source.h"
35 #include "grit/theme_resources.h" 35 #include "grit/theme_resources.h"
36 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 36 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
37 37
38 using extensions::Extension; 38 using extensions::Extension;
39 using extensions::ExtensionList; 39 using extensions::ExtensionList;
40 40
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 const extensions::ExtensionList& toolbar_items = 877 const extensions::ExtensionList& toolbar_items =
878 toolbarModel_->toolbar_items(); 878 toolbarModel_->toolbar_items();
879 if (index < toolbar_items.size()) { 879 if (index < toolbar_items.size()) {
880 const Extension* extension = toolbar_items[index]; 880 const Extension* extension = toolbar_items[index];
881 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; 881 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
882 } 882 }
883 return nil; 883 return nil;
884 } 884 }
885 885
886 @end 886 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698