chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. 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

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/prefs/pref_service.h"

10 #include "base/sys_string_conversions.h"	11 #include "base/sys_string_conversions.h"

11 #include "chrome/browser/extensions/extension_action.h"	12 #include "chrome/browser/extensions/extension_action.h"

12 #include "chrome/browser/extensions/extension_action_manager.h"	13 #include "chrome/browser/extensions/extension_action_manager.h"

13 #include "chrome/browser/extensions/extension_service.h"	14 #include "chrome/browser/extensions/extension_service.h"

14 #include "chrome/browser/extensions/extension_system.h"	15 #include "chrome/browser/extensions/extension_system.h"

15 #include "chrome/browser/extensions/extension_toolbar_model.h"	16 #include "chrome/browser/extensions/extension_toolbar_model.h"

16 #include "chrome/browser/prefs/pref_registry_syncable.h"	17 #include "chrome/browser/prefs/pref_registry_syncable.h"

17 #include "chrome/browser/prefs/pref_service.h"

18 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

19 #include "chrome/browser/sessions/session_tab_helper.h"	19 #include "chrome/browser/sessions/session_tab_helper.h"

20 #include "chrome/browser/ui/browser.h"	20 #include "chrome/browser/ui/browser.h"

21 #include "chrome/browser/ui/browser_window.h"	21 #include "chrome/browser/ui/browser_window.h"

22 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"	22 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"

23 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"	23 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"

24 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"	24 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"

25 #import "chrome/browser/ui/cocoa/image_button_cell.h"	25 #import "chrome/browser/ui/cocoa/image_button_cell.h"

26 #import "chrome/browser/ui/cocoa/menu_button.h"	26 #import "chrome/browser/ui/cocoa/menu_button.h"

27 #include "chrome/browser/ui/tabs/tab_strip_model.h"	27 #include "chrome/browser/ui/tabs/tab_strip_model.h"

(...skipping 846 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
874 const extensions::ExtensionList& toolbar_items =	874 const extensions::ExtensionList& toolbar_items =

875 toolbarModel_->toolbar_items();	875 toolbarModel_->toolbar_items();

876 if (index < toolbar_items.size()) {	876 if (index < toolbar_items.size()) {

877 const Extension* extension = toolbar_items[index];	877 const Extension* extension = toolbar_items[index];

878 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];	878 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];

879 }	879 }

880 return nil;	880 return nil;

881 }	881 }

882	882

883 @end	883 @end

OLD	NEW