chrome/browser/cocoa/bookmark_bar_controller.mm - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

Side by Side Diff: chrome/browser/cocoa/bookmark_bar_controller.mm

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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

« no previous file with comments | « chrome/browser/chromeos/usb_mount_observer.cc ('k') | chrome/browser/cocoa/browser_window_cocoa.mm » ('j') | chrome/chrome_browser.gypi » ('J')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/cocoa/bookmark_bar_controller.h"	5 #import "chrome/browser/cocoa/bookmark_bar_controller.h"

6 #include "app/l10n_util_mac.h"	6 #include "app/l10n_util_mac.h"

7 #include "app/resource_bundle.h"	7 #include "app/resource_bundle.h"

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

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

10 #include "chrome/browser/bookmarks/bookmark_editor.h"	10 #include "chrome/browser/bookmarks/bookmark_editor.h"

(...skipping 18 matching lines...) Expand all Loading...
29 #import "chrome/browser/cocoa/browser_window_controller.h"	29 #import "chrome/browser/cocoa/browser_window_controller.h"

30 #import "chrome/browser/cocoa/event_utils.h"	30 #import "chrome/browser/cocoa/event_utils.h"

31 #import "chrome/browser/cocoa/fullscreen_controller.h"	31 #import "chrome/browser/cocoa/fullscreen_controller.h"

32 #import "chrome/browser/cocoa/import_settings_dialog.h"	32 #import "chrome/browser/cocoa/import_settings_dialog.h"

33 #import "chrome/browser/cocoa/menu_button.h"	33 #import "chrome/browser/cocoa/menu_button.h"

34 #import "chrome/browser/cocoa/themed_window.h"	34 #import "chrome/browser/cocoa/themed_window.h"

35 #import "chrome/browser/cocoa/toolbar_controller.h"	35 #import "chrome/browser/cocoa/toolbar_controller.h"

36 #import "chrome/browser/cocoa/view_id_util.h"	36 #import "chrome/browser/cocoa/view_id_util.h"

37 #import "chrome/browser/cocoa/view_resizer.h"	37 #import "chrome/browser/cocoa/view_resizer.h"

38 #include "chrome/browser/metrics/user_metrics.h"	38 #include "chrome/browser/metrics/user_metrics.h"

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

40 #include "chrome/browser/profile.h"	40 #include "chrome/browser/profile.h"

41 #include "chrome/browser/tab_contents/tab_contents.h"	41 #include "chrome/browser/tab_contents/tab_contents.h"

42 #include "chrome/browser/tab_contents/tab_contents_view.h"	42 #include "chrome/browser/tab_contents/tab_contents_view.h"

43 #import "chrome/browser/themes/browser_theme_provider.h"	43 #import "chrome/browser/themes/browser_theme_provider.h"

44 #include "chrome/common/pref_names.h"	44 #include "chrome/common/pref_names.h"

45 #include "grit/app_resources.h"	45 #include "grit/app_resources.h"

46 #include "grit/generated_resources.h"	46 #include "grit/generated_resources.h"

47 #include "grit/theme_resources.h"	47 #include "grit/theme_resources.h"

48 #include "skia/ext/skia_utils_mac.h"	48 #include "skia/ext/skia_utils_mac.h"

49	49

(...skipping 2382 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2432 // to minimize touching the object passed in (likely a mock).	2432 // to minimize touching the object passed in (likely a mock).

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

2434 buttonContextMenu_ = menu;	2434 buttonContextMenu_ = menu;

2435 }	2435 }

2436	2436

2437 - (void)setIgnoreAnimations:(BOOL)ignore {	2437 - (void)setIgnoreAnimations:(BOOL)ignore {

2438 ignoreAnimations_ = ignore;	2438 ignoreAnimations_ = ignore;

2439 }	2439 }

2440	2440

2441 @end	2441 @end

OLD	NEW