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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller_private.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/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller_unittest.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/browser_window_controller_private.h"	5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"

6	6

7 #include <cmath>	7 #include <cmath>

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #import "base/memory/scoped_nsobject.h"	10 #import "base/memory/scoped_nsobject.h"

	11 #include "base/prefs/pref_service.h"

11 #include "chrome/browser/browser_process.h"	12 #include "chrome/browser/browser_process.h"

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

13 #include "chrome/browser/prefs/scoped_user_pref_update.h"	13 #include "chrome/browser/prefs/scoped_user_pref_update.h"

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

15 #include "chrome/browser/profiles/profile_info_util.h"	15 #include "chrome/browser/profiles/profile_info_util.h"

16 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"	16 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"

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

18 #include "chrome/browser/ui/browser_window_state.h"	18 #include "chrome/browser/ui/browser_window_state.h"

19 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"

20 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"	19 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"

21 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"	20 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"

22 #import "chrome/browser/ui/cocoa/fast_resize_view.h"	21 #import "chrome/browser/ui/cocoa/fast_resize_view.h"

23 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"	22 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"

24 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"	23 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"

25 #import "chrome/browser/ui/cocoa/framed_browser_window.h"	24 #import "chrome/browser/ui/cocoa/framed_browser_window.h"

26 #import "chrome/browser/ui/cocoa/fullscreen_window.h"	25 #import "chrome/browser/ui/cocoa/fullscreen_window.h"

27 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"	26 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"

	27 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"

28 #import "chrome/browser/ui/cocoa/nsview_additions.h"	28 #import "chrome/browser/ui/cocoa/nsview_additions.h"

29 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"	29 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"

30 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"	30 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"

31 #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"	31 #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"

32 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"	32 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

33 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"	33 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"

34 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"	34 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

35 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"	35 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"

36 #include "chrome/browser/ui/search/search_model.h"	36 #include "chrome/browser/ui/search/search_model.h"

37 #include "chrome/browser/ui/search/search_ui.h"	37 #include "chrome/browser/ui/search/search_ui.h"

(...skipping 934 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
972 relativeTo:[bookmarkBarController_ view]];	972 relativeTo:[bookmarkBarController_ view]];

973 } else {	973 } else {

974 [contentView cr_ensureSubview:floatingBarBackingView_	974 [contentView cr_ensureSubview:floatingBarBackingView_

975 isPositioned:NSWindowBelow	975 isPositioned:NSWindowBelow

976 relativeTo:[bookmarkBarController_ view]];	976 relativeTo:[bookmarkBarController_ view]];

977 }	977 }

978 }	978 }

979 }	979 }

980	980

981 @end // @implementation BrowserWindowController(Private)	981 @end // @implementation BrowserWindowController(Private)

OLD	NEW