chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm - Issue 10677009: Move command handling and updating off Browser and onto a helper object.

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 10677009: Move command handling and updating off Browser and onto a helper object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 5 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/location_bar/location_bar_view_mac.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6	6

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

8	8

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

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

11 #include "base/memory/singleton.h"	11 #include "base/memory/singleton.h"

12 #include "base/string_util.h"	12 #include "base/string_util.h"

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

14 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

15 #include "chrome/app/chrome_command_ids.h"	15 #include "chrome/app/chrome_command_ids.h"

16 #include "chrome/browser/autocomplete/autocomplete.h"	16 #include "chrome/browser/autocomplete/autocomplete.h"

17 #include "chrome/browser/autocomplete/autocomplete_classifier.h"	17 #include "chrome/browser/autocomplete/autocomplete_classifier.h"

18 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"	18 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"

19 #include "chrome/browser/autocomplete/autocomplete_match.h"	19 #include "chrome/browser/autocomplete/autocomplete_match.h"

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

20 #include "chrome/browser/net/url_fixer_upper.h"	21 #include "chrome/browser/net/url_fixer_upper.h"

21 #include "chrome/browser/prefs/pref_service.h"	22 #include "chrome/browser/prefs/pref_service.h"

22 #include "chrome/browser/profiles/profile.h"	23 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/search_engines/template_url_service.h"	24 #include "chrome/browser/search_engines/template_url_service.h"

24 #include "chrome/browser/themes/theme_service.h"	25 #include "chrome/browser/themes/theme_service.h"

25 #include "chrome/browser/ui/browser.h"	26 #include "chrome/browser/ui/browser.h"

26 #include "chrome/browser/ui/browser_window.h"	27 #include "chrome/browser/ui/browser_window.h"

27 #import "chrome/browser/ui/cocoa/background_gradient_view.h"	28 #import "chrome/browser/ui/cocoa/background_gradient_view.h"

28 #include "chrome/browser/ui/cocoa/drag_util.h"	29 #include "chrome/browser/ui/cocoa/drag_util.h"

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

(...skipping 766 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
796 - (void)hideDropURLsIndicatorInView:(NSView*)view {	797 - (void)hideDropURLsIndicatorInView:(NSView*)view {

797 // Do nothing.	798 // Do nothing.

798 }	799 }

799	800

800 // (URLDropTargetController protocol)	801 // (URLDropTargetController protocol)

801 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {	802 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {

802 return drag_util::IsUnsupportedDropData(profile_, info);	803 return drag_util::IsUnsupportedDropData(profile_, info);

803 }	804 }

804	805

805 @end	806 @end

OLD	NEW