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

Side by Side Diff: chrome/browser/cocoa/toolbar_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, 3 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/cocoa/toolbar_controller.h ('k') | chrome/browser/cocoa/toolbar_controller_unittest.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/toolbar_controller.h"	5 #import "chrome/browser/cocoa/toolbar_controller.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "app/l10n_util.h"	9 #include "app/l10n_util.h"

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

(...skipping 17 matching lines...) Expand all Loading...
28 #import "chrome/browser/cocoa/gradient_button_cell.h"	28 #import "chrome/browser/cocoa/gradient_button_cell.h"

29 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.h"	29 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.h"

30 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"	30 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"

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

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

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

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

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

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

37 #include "chrome/browser/net/url_fixer_upper.h"	37 #include "chrome/browser/net/url_fixer_upper.h"

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

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

40 #include "chrome/browser/search_engines/template_url_model.h"	40 #include "chrome/browser/search_engines/template_url_model.h"

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

42 #include "chrome/browser/themes/browser_theme_provider.h"	42 #include "chrome/browser/themes/browser_theme_provider.h"

43 #include "chrome/browser/toolbar_model.h"	43 #include "chrome/browser/toolbar_model.h"

44 #include "chrome/browser/upgrade_detector.h"	44 #include "chrome/browser/upgrade_detector.h"

45 #include "chrome/browser/wrench_menu_model.h"	45 #include "chrome/browser/wrench_menu_model.h"

46 #include "chrome/common/notification_details.h"	46 #include "chrome/common/notification_details.h"

47 #include "chrome/common/notification_observer.h"	47 #include "chrome/common/notification_observer.h"

48 #include "chrome/common/notification_service.h"	48 #include "chrome/common/notification_service.h"

(...skipping 744 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
793 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {	793 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {

794 // Do nothing.	794 // Do nothing.

795 }	795 }

796	796

797 // (URLDropTargetController protocol)	797 // (URLDropTargetController protocol)

798 - (void)hideDropURLsIndicatorInView:(NSView*)view {	798 - (void)hideDropURLsIndicatorInView:(NSView*)view {

799 // Do nothing.	799 // Do nothing.

800 }	800 }

801	801

802 @end	802 @end

OLD	NEW