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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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

« no previous file with comments | « chrome/browser/ui/chrome_select_file_policy_unittest.cc ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

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 "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"	5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"

6	6

7 #include "base/mac/bundle_locations.h"	7 #include "base/mac/bundle_locations.h"

8 #include "base/mac/mac_util.h"	8 #include "base/mac/mac_util.h"

9 #include "base/metrics/histogram.h"	9 #include "base/metrics/histogram.h"

	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/bookmarks/bookmark_editor.h"	12 #include "chrome/browser/bookmarks/bookmark_editor.h"

12 #include "chrome/browser/bookmarks/bookmark_model.h"	13 #include "chrome/browser/bookmarks/bookmark_model.h"

13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	14 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

14 #include "chrome/browser/bookmarks/bookmark_utils.h"	15 #include "chrome/browser/bookmarks/bookmark_utils.h"

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

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

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

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

19 #import "chrome/browser/themes/theme_service.h"	19 #import "chrome/browser/themes/theme_service.h"

20 #import "chrome/browser/themes/theme_service_factory.h"	20 #import "chrome/browser/themes/theme_service_factory.h"

21 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"	21 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"

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

23 #include "chrome/browser/ui/browser_list.h"	23 #include "chrome/browser/ui/browser_list.h"

24 #include "chrome/browser/ui/chrome_pages.h"	24 #include "chrome/browser/ui/chrome_pages.h"

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

26 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h"	26 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h"

27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"	27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"

(...skipping 2807 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2835 return buttonContextMenu_;	2835 return buttonContextMenu_;

2836 }	2836 }

2837	2837

2838 // Intentionally ignores ownership issues; used for testing and we try	2838 // Intentionally ignores ownership issues; used for testing and we try

2839 // to minimize touching the object passed in (likely a mock).	2839 // to minimize touching the object passed in (likely a mock).

2840 - (void)setButtonContextMenu:(id)menu {	2840 - (void)setButtonContextMenu:(id)menu {

2841 buttonContextMenu_ = menu;	2841 buttonContextMenu_ = menu;

2842 }	2842 }

2843	2843

2844 @end	2844 @end

OLD	NEW