Chromium Code Reviews| 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 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 628 AccessibilityTextBoxInfo info(profile(), | 628 AccessibilityTextBoxInfo info(profile(), |
| 629 l10n_util::GetStringUTF8(IDS_ACCNAME_LOCATION), | 629 l10n_util::GetStringUTF8(IDS_ACCNAME_LOCATION), |
| 630 std::string(), false); | 630 std::string(), false); |
| 631 ExtensionAccessibilityEventRouter::GetInstance()->HandleControlEvent( | 631 ExtensionAccessibilityEventRouter::GetInstance()->HandleControlEvent( |
| 632 ui::AX_EVENT_FOCUS, &info); | 632 ui::AX_EVENT_FOCUS, &info); |
| 633 | 633 |
| 634 // Update the keyword and search hint states. | 634 // Update the keyword and search hint states. |
| 635 OnChanged(); | 635 OnChanged(); |
| 636 } | 636 } |
| 637 | 637 |
| 638 void LocationBarViewGtk::ShowURL() { | |
| 639 omnibox_view_->ShowURL(); | |
| 640 } | |
| 641 | |
| 642 void LocationBarViewGtk::HideURL() { | |
|
Peter Kasting
2014/03/21 21:22:10
Nit: .cc file order must match .h file order.
Justin Donnelly
2014/03/24 22:59:37
Done.
| |
| 643 omnibox_view_->HideURL(); | |
| 644 } | |
| 645 | |
| 638 InstantController* LocationBarViewGtk::GetInstant() { | 646 InstantController* LocationBarViewGtk::GetInstant() { |
| 639 return browser_->instant_controller() ? | 647 return browser_->instant_controller() ? |
| 640 browser_->instant_controller()->instant() : NULL; | 648 browser_->instant_controller()->instant() : NULL; |
| 641 } | 649 } |
| 642 | 650 |
| 643 WebContents* LocationBarViewGtk::GetWebContents() { | 651 WebContents* LocationBarViewGtk::GetWebContents() { |
| 644 return browser_->tab_strip_model()->GetActiveWebContents(); | 652 return browser_->tab_strip_model()->GetActiveWebContents(); |
| 645 } | 653 } |
| 646 | 654 |
| 647 ToolbarModel* LocationBarViewGtk::GetToolbarModel() { | 655 ToolbarModel* LocationBarViewGtk::GetToolbarModel() { |
| (...skipping 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1963 void* user_data) { | 1971 void* user_data) { |
| 1964 PageActionViewGtk* view = static_cast<PageActionViewGtk*>(user_data); | 1972 PageActionViewGtk* view = static_cast<PageActionViewGtk*>(user_data); |
| 1965 if (!gtk_widget_get_visible(view->widget())) | 1973 if (!gtk_widget_get_visible(view->widget())) |
| 1966 return FALSE; | 1974 return FALSE; |
| 1967 | 1975 |
| 1968 GdkEventButton event = {}; | 1976 GdkEventButton event = {}; |
| 1969 event.type = GDK_BUTTON_PRESS; | 1977 event.type = GDK_BUTTON_PRESS; |
| 1970 event.button = 1; | 1978 event.button = 1; |
| 1971 return view->OnButtonPressed(view->widget(), &event); | 1979 return view->OnButtonPressed(view->widget(), &event); |
| 1972 } | 1980 } |
| OLD | NEW |