Chromium Code Reviews| 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/location_bar_view_mac.h" | 5 #import "chrome/browser/cocoa/location_bar_view_mac.h" |
| 6 | 6 |
| 7 #include "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/nsimage_cache_mac.h" | 10 #include "base/nsimage_cache_mac.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 } | 142 } |
| 143 | 143 |
| 144 std::wstring LocationBarViewMac::GetInputString() const { | 144 std::wstring LocationBarViewMac::GetInputString() const { |
| 145 return location_input_; | 145 return location_input_; |
| 146 } | 146 } |
| 147 | 147 |
| 148 WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const { | 148 WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const { |
| 149 return disposition_; | 149 return disposition_; |
| 150 } | 150 } |
| 151 | 151 |
| 152 // TODO(thakis): Ping shess to verify what he wants to verify. | |
| 153 // TODO(shess): Verify that this TODO is TODONE. | |
| 154 // TODO(rohitrao): Fix this to return different types once autocomplete and | |
| 155 // the onmibar are implemented. For now, any URL that comes from the | |
| 156 // LocationBar has to have been entered by the user, and thus is of type | |
| 157 // PageTransition::TYPED. | |
|
Nico
2010/05/19 20:34:53
:-)
| |
| 158 PageTransition::Type LocationBarViewMac::GetPageTransition() const { | 152 PageTransition::Type LocationBarViewMac::GetPageTransition() const { |
| 159 return transition_; | 153 return transition_; |
| 160 } | 154 } |
| 161 | 155 |
| 162 void LocationBarViewMac::AcceptInput() { | 156 void LocationBarViewMac::AcceptInput() { |
| 163 WindowOpenDisposition disposition = | 157 WindowOpenDisposition disposition = |
| 164 event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); | 158 event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); |
| 165 AcceptInputWithDisposition(disposition); | 159 AcceptInputWithDisposition(disposition); |
| 166 } | 160 } |
| 167 | 161 |
| (...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1001 ++result; | 995 ++result; |
| 1002 } | 996 } |
| 1003 return result; | 997 return result; |
| 1004 } | 998 } |
| 1005 | 999 |
| 1006 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame, | 1000 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame, |
| 1007 size_t index) { | 1001 size_t index) { |
| 1008 ViewAt(index)->OnMousePressed(iconFrame); | 1002 ViewAt(index)->OnMousePressed(iconFrame); |
| 1009 } | 1003 } |
| 1010 | 1004 |
| OLD | NEW |