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/ui/cocoa/location_bar/location_bar_view_mac.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/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/stl_util-inl.h" | 9 #include "base/stl_util-inl.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 } | 249 } |
250 | 250 |
251 bool LocationBarViewMac::OnCommitSuggestedText(const std::wstring& typed_text) { | 251 bool LocationBarViewMac::OnCommitSuggestedText(const std::wstring& typed_text) { |
252 return edit_view_->CommitSuggestText(); | 252 return edit_view_->CommitSuggestText(); |
253 } | 253 } |
254 | 254 |
255 bool LocationBarViewMac::AcceptCurrentInstantPreview() { | 255 bool LocationBarViewMac::AcceptCurrentInstantPreview() { |
256 return InstantController::CommitIfCurrent(browser_->instant()); | 256 return InstantController::CommitIfCurrent(browser_->instant()); |
257 } | 257 } |
258 | 258 |
259 void LocationBarViewMac::OnSetSuggestedSearchText( | |
260 const string16& suggested_text) { | |
261 SetSuggestedText(suggested_text); | |
262 } | |
263 | |
264 void LocationBarViewMac::OnPopupBoundsChanged(const gfx::Rect& bounds) { | 259 void LocationBarViewMac::OnPopupBoundsChanged(const gfx::Rect& bounds) { |
265 InstantController* instant = browser_->instant(); | 260 InstantController* instant = browser_->instant(); |
266 if (instant) | 261 if (instant) |
267 instant->SetOmniboxBounds(bounds); | 262 instant->SetOmniboxBounds(bounds); |
268 } | 263 } |
269 | 264 |
270 void LocationBarViewMac::OnAutocompleteAccept(const GURL& url, | 265 void LocationBarViewMac::OnAutocompleteAccept(const GURL& url, |
271 WindowOpenDisposition disposition, | 266 WindowOpenDisposition disposition, |
272 PageTransition::Type transition, | 267 PageTransition::Type transition, |
273 const GURL& alternate_nav_url) { | 268 const GURL& alternate_nav_url) { |
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
686 | 681 |
687 // These need to change anytime the layout changes. | 682 // These need to change anytime the layout changes. |
688 // TODO(shess): Anytime the field editor might have changed, the | 683 // TODO(shess): Anytime the field editor might have changed, the |
689 // cursor rects almost certainly should have changed. The tooltips | 684 // cursor rects almost certainly should have changed. The tooltips |
690 // might change even when the rects don't change. | 685 // might change even when the rects don't change. |
691 [field_ resetFieldEditorFrameIfNeeded]; | 686 [field_ resetFieldEditorFrameIfNeeded]; |
692 [field_ updateCursorAndToolTipRects]; | 687 [field_ updateCursorAndToolTipRects]; |
693 | 688 |
694 [field_ setNeedsDisplay:YES]; | 689 [field_ setNeedsDisplay:YES]; |
695 } | 690 } |
OLD | NEW |