| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" | 5 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 | 841 |
| 842 void LocationBarViewGtk::ShowFirstRunBubble() { | 842 void LocationBarViewGtk::ShowFirstRunBubble() { |
| 843 // We need the browser window to be shown before we can show the bubble, but | 843 // We need the browser window to be shown before we can show the bubble, but |
| 844 // we get called before that's happened. | 844 // we get called before that's happened. |
| 845 MessageLoop::current()->PostTask( | 845 MessageLoop::current()->PostTask( |
| 846 FROM_HERE, | 846 FROM_HERE, |
| 847 base::Bind(&LocationBarViewGtk::ShowFirstRunBubbleInternal, | 847 base::Bind(&LocationBarViewGtk::ShowFirstRunBubbleInternal, |
| 848 weak_ptr_factory_.GetWeakPtr())); | 848 weak_ptr_factory_.GetWeakPtr())); |
| 849 } | 849 } |
| 850 | 850 |
| 851 void LocationBarViewGtk::SetInstantSuggestion( | |
| 852 const InstantSuggestion& suggestion) { | |
| 853 location_entry_->model()->SetInstantSuggestion(suggestion); | |
| 854 } | |
| 855 | |
| 856 string16 LocationBarViewGtk::GetInputString() const { | 851 string16 LocationBarViewGtk::GetInputString() const { |
| 857 return location_input_; | 852 return location_input_; |
| 858 } | 853 } |
| 859 | 854 |
| 860 WindowOpenDisposition LocationBarViewGtk::GetWindowOpenDisposition() const { | 855 WindowOpenDisposition LocationBarViewGtk::GetWindowOpenDisposition() const { |
| 861 return disposition_; | 856 return disposition_; |
| 862 } | 857 } |
| 863 | 858 |
| 864 content::PageTransition LocationBarViewGtk::GetPageTransition() const { | 859 content::PageTransition LocationBarViewGtk::GetPageTransition() const { |
| 865 return transition_; | 860 return transition_; |
| (...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2099 } | 2094 } |
| 2100 | 2095 |
| 2101 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( | 2096 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( |
| 2102 ExtensionAction* action) { | 2097 ExtensionAction* action) { |
| 2103 ExtensionPopupGtk::Show( | 2098 ExtensionPopupGtk::Show( |
| 2104 action->GetPopupUrl(current_tab_id_), | 2099 action->GetPopupUrl(current_tab_id_), |
| 2105 owner_->browser_, | 2100 owner_->browser_, |
| 2106 event_box_.get(), | 2101 event_box_.get(), |
| 2107 ExtensionPopupGtk::SHOW_AND_INSPECT); | 2102 ExtensionPopupGtk::SHOW_AND_INSPECT); |
| 2108 } | 2103 } |
| OLD | NEW |