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/foundation_util.h" | 10 #include "base/mac/foundation_util.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 #include "chrome/browser/ui/toolbar/wrench_menu_badge_controller.h" | 46 #include "chrome/browser/ui/toolbar/wrench_menu_badge_controller.h" |
47 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 47 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
48 #include "chrome/common/pref_names.h" | 48 #include "chrome/common/pref_names.h" |
49 #include "chrome/grit/chromium_strings.h" | 49 #include "chrome/grit/chromium_strings.h" |
50 #include "chrome/grit/generated_resources.h" | 50 #include "chrome/grit/generated_resources.h" |
51 #include "components/metrics/proto/omnibox_event.pb.h" | 51 #include "components/metrics/proto/omnibox_event.pb.h" |
52 #include "components/omnibox/browser/autocomplete_classifier.h" | 52 #include "components/omnibox/browser/autocomplete_classifier.h" |
53 #include "components/omnibox/browser/autocomplete_match.h" | 53 #include "components/omnibox/browser/autocomplete_match.h" |
54 #include "components/omnibox/browser/omnibox_view.h" | 54 #include "components/omnibox/browser/omnibox_view.h" |
55 #include "components/search_engines/template_url_service.h" | 55 #include "components/search_engines/template_url_service.h" |
56 #include "components/url_fixer/url_fixer.h" | 56 #include "components/url_formatter/url_fixer.h" |
57 #include "content/public/browser/web_contents.h" | 57 #include "content/public/browser/web_contents.h" |
58 #include "grit/theme_resources.h" | 58 #include "grit/theme_resources.h" |
59 #import "ui/base/cocoa/menu_controller.h" | 59 #import "ui/base/cocoa/menu_controller.h" |
60 #include "ui/base/l10n/l10n_util.h" | 60 #include "ui/base/l10n/l10n_util.h" |
61 #include "ui/base/l10n/l10n_util_mac.h" | 61 #include "ui/base/l10n/l10n_util_mac.h" |
62 #include "ui/gfx/geometry/rect.h" | 62 #include "ui/gfx/geometry/rect.h" |
63 #include "ui/gfx/image/image.h" | 63 #include "ui/gfx/image/image.h" |
64 | 64 |
65 using content::OpenURLParams; | 65 using content::OpenURLParams; |
66 using content::Referrer; | 66 using content::Referrer; |
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
898 if ([urls count] < 1) { | 898 if ([urls count] < 1) { |
899 NOTREACHED(); | 899 NOTREACHED(); |
900 return; | 900 return; |
901 } | 901 } |
902 | 902 |
903 // TODO(viettrungluu): dropping multiple URLs? | 903 // TODO(viettrungluu): dropping multiple URLs? |
904 if ([urls count] > 1) | 904 if ([urls count] > 1) |
905 NOTIMPLEMENTED(); | 905 NOTIMPLEMENTED(); |
906 | 906 |
907 // Get the first URL and fix it up. | 907 // Get the first URL and fix it up. |
908 GURL url(url_fixer::FixupURL(base::SysNSStringToUTF8([urls objectAtIndex:0]), | 908 GURL url(url_formatter::FixupURL( |
909 std::string())); | 909 base::SysNSStringToUTF8([urls objectAtIndex:0]), std::string())); |
910 | 910 |
911 if (url.SchemeIs(url::kJavaScriptScheme)) { | 911 if (url.SchemeIs(url::kJavaScriptScheme)) { |
912 browser_->window()->GetLocationBar()->GetOmniboxView()->SetUserText( | 912 browser_->window()->GetLocationBar()->GetOmniboxView()->SetUserText( |
913 OmniboxView::StripJavascriptSchemas(base::UTF8ToUTF16(url.spec()))); | 913 OmniboxView::StripJavascriptSchemas(base::UTF8ToUTF16(url.spec()))); |
914 } | 914 } |
915 OpenURLParams params( | 915 OpenURLParams params( |
916 url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false); | 916 url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false); |
917 browser_->tab_strip_model()->GetActiveWebContents()->OpenURL(params); | 917 browser_->tab_strip_model()->GetActiveWebContents()->OpenURL(params); |
918 } | 918 } |
919 | 919 |
(...skipping 24 matching lines...) Expand all Loading... |
944 - (void)hideDropURLsIndicatorInView:(NSView*)view { | 944 - (void)hideDropURLsIndicatorInView:(NSView*)view { |
945 // Do nothing. | 945 // Do nothing. |
946 } | 946 } |
947 | 947 |
948 // (URLDropTargetController protocol) | 948 // (URLDropTargetController protocol) |
949 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { | 949 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { |
950 return drag_util::IsUnsupportedDropData(profile_, info); | 950 return drag_util::IsUnsupportedDropData(profile_, info); |
951 } | 951 } |
952 | 952 |
953 @end | 953 @end |
OLD | NEW |