chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm - Issue 10700027: browser: Move global error to subdir.

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

Issue 10700027: browser: Move global error to subdir. (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/global_error_bubble_controller.mm ('k') | chrome/browser/ui/global_error.h » ('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/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"

(...skipping 24 matching lines...) Expand all Loading...
35 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"	35 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"

36 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"	36 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

37 #import "chrome/browser/ui/cocoa/menu_button.h"	37 #import "chrome/browser/ui/cocoa/menu_button.h"

38 #import "chrome/browser/ui/cocoa/menu_controller.h"	38 #import "chrome/browser/ui/cocoa/menu_controller.h"

39 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"	39 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"

40 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h"	40 #import "chrome/browser/ui/cocoa/toolbar/reload_button.h"

41 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h"	41 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h"

42 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h"	42 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h"

43 #import "chrome/browser/ui/cocoa/view_id_util.h"	43 #import "chrome/browser/ui/cocoa/view_id_util.h"

44 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"	44 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"

45 #include "chrome/browser/ui/global_error_service.h"	45 #include "chrome/browser/ui/global_error/global_error_service.h"

46 #include "chrome/browser/ui/global_error_service_factory.h"	46 #include "chrome/browser/ui/global_error/global_error_service_factory.h"

47 #include "chrome/browser/ui/omnibox/omnibox_view.h"	47 #include "chrome/browser/ui/omnibox/omnibox_view.h"

48 #include "chrome/browser/ui/toolbar/toolbar_model.h"	48 #include "chrome/browser/ui/toolbar/toolbar_model.h"

49 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	49 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

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

51 #include "chrome/common/chrome_notification_types.h"	51 #include "chrome/common/chrome_notification_types.h"

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

	53 #include "content/public/browser/notification_details.h"

53 #include "content/public/browser/notification_observer.h"	54 #include "content/public/browser/notification_observer.h"

54 #include "content/public/browser/notification_service.h"	55 #include "content/public/browser/notification_service.h"

55 #include "content/public/browser/notification_details.h"

56 #include "content/public/browser/web_contents.h"	56 #include "content/public/browser/web_contents.h"

57 #include "grit/chromium_strings.h"	57 #include "grit/chromium_strings.h"

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

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

60 #include "grit/theme_resources_standard.h"	60 #include "grit/theme_resources_standard.h"

61 #include "ui/base/l10n/l10n_util.h"	61 #include "ui/base/l10n/l10n_util.h"

62 #include "ui/base/l10n/l10n_util_mac.h"	62 #include "ui/base/l10n/l10n_util_mac.h"

63 #include "ui/base/resource/resource_bundle.h"	63 #include "ui/base/resource/resource_bundle.h"

64 #include "ui/gfx/image/image.h"	64 #include "ui/gfx/image/image.h"

65 #include "ui/gfx/rect.h"	65 #include "ui/gfx/rect.h"

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

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

799 }	799 }

800	800

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

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

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

804 }	804 }

805	805

806 @end	806 @end

OLD	NEW