| OLD | NEW |
| 1 // Copyright (c) 2009 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 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" | 5 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/gtk_dnd_util.h" | 9 #include "app/gtk_dnd_util.h" |
| 10 #include "app/gfx/canvas_paint.h" | 10 #include "app/gfx/canvas_paint.h" |
| 11 #include "app/gfx/gtk_util.h" | 11 #include "app/gfx/gtk_util.h" |
| (...skipping 1938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1950 GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); | 1950 GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); |
| 1951 DCHECK(clipboard); | 1951 DCHECK(clipboard); |
| 1952 gchar* selection_text = gtk_clipboard_wait_for_text(clipboard); | 1952 gchar* selection_text = gtk_clipboard_wait_for_text(clipboard); |
| 1953 if (!selection_text) | 1953 if (!selection_text) |
| 1954 return; | 1954 return; |
| 1955 | 1955 |
| 1956 // Use autocomplete to clean up the text, going so far as to turn it into | 1956 // Use autocomplete to clean up the text, going so far as to turn it into |
| 1957 // a search query if necessary. | 1957 // a search query if necessary. |
| 1958 AutocompleteController controller(tabstrip->model_->profile()); | 1958 AutocompleteController controller(tabstrip->model_->profile()); |
| 1959 controller.Start(UTF8ToWide(selection_text), | 1959 controller.Start(UTF8ToWide(selection_text), |
| 1960 EmptyWString(), // desired_tld | 1960 std::wstring(), // desired_tld |
| 1961 true, // prevent_inline_autocomplete | 1961 true, // prevent_inline_autocomplete |
| 1962 false, // prefer_keyword | 1962 false, // prefer_keyword |
| 1963 true); // synchronous_only | 1963 true); // synchronous_only |
| 1964 g_free(selection_text); | 1964 g_free(selection_text); |
| 1965 const AutocompleteResult& result = controller.result(); | 1965 const AutocompleteResult& result = controller.result(); |
| 1966 AutocompleteResult::const_iterator it = result.default_match(); | 1966 AutocompleteResult::const_iterator it = result.default_match(); |
| 1967 if (it == result.end()) | 1967 if (it == result.end()) |
| 1968 return; | 1968 return; |
| 1969 | 1969 |
| 1970 GURL url(it->destination_url); | 1970 GURL url(it->destination_url); |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2032 | 2032 |
| 2033 // Let the middle mouse button initiate clicks as well. | 2033 // Let the middle mouse button initiate clicks as well. |
| 2034 gtk_util::SetButtonTriggersNavigation(button->widget()); | 2034 gtk_util::SetButtonTriggersNavigation(button->widget()); |
| 2035 g_signal_connect(G_OBJECT(button->widget()), "clicked", | 2035 g_signal_connect(G_OBJECT(button->widget()), "clicked", |
| 2036 G_CALLBACK(OnNewTabClicked), this); | 2036 G_CALLBACK(OnNewTabClicked), this); |
| 2037 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); | 2037 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); |
| 2038 gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0); | 2038 gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0); |
| 2039 | 2039 |
| 2040 return button; | 2040 return button; |
| 2041 } | 2041 } |
| OLD | NEW |