OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 14 matching lines...) Expand all Loading... |
25 #include "chrome/browser/command_updater.h" | 25 #include "chrome/browser/command_updater.h" |
26 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 26 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
27 #include "chrome/browser/defaults.h" | 27 #include "chrome/browser/defaults.h" |
28 #include "chrome/browser/extensions/api/commands/command_service.h" | 28 #include "chrome/browser/extensions/api/commands/command_service.h" |
29 #include "chrome/browser/extensions/api/commands/command_service_factory.h" | 29 #include "chrome/browser/extensions/api/commands/command_service_factory.h" |
30 #include "chrome/browser/extensions/extension_service.h" | 30 #include "chrome/browser/extensions/extension_service.h" |
31 #include "chrome/browser/extensions/extension_tab_util.h" | 31 #include "chrome/browser/extensions/extension_tab_util.h" |
32 #include "chrome/browser/extensions/location_bar_controller.h" | 32 #include "chrome/browser/extensions/location_bar_controller.h" |
33 #include "chrome/browser/extensions/tab_helper.h" | 33 #include "chrome/browser/extensions/tab_helper.h" |
34 #include "chrome/browser/favicon/favicon_tab_helper.h" | 34 #include "chrome/browser/favicon/favicon_tab_helper.h" |
35 #include "chrome/browser/instant/instant_controller.h" | |
36 #include "chrome/browser/profiles/profile.h" | 35 #include "chrome/browser/profiles/profile.h" |
37 #include "chrome/browser/search_engines/template_url.h" | 36 #include "chrome/browser/search_engines/template_url.h" |
38 #include "chrome/browser/search_engines/template_url_service.h" | 37 #include "chrome/browser/search_engines/template_url_service.h" |
39 #include "chrome/browser/search_engines/template_url_service_factory.h" | 38 #include "chrome/browser/search_engines/template_url_service_factory.h" |
40 #include "chrome/browser/ui/browser.h" | 39 #include "chrome/browser/ui/browser.h" |
41 #include "chrome/browser/ui/browser_command_controller.h" | 40 #include "chrome/browser/ui/browser_command_controller.h" |
42 #include "chrome/browser/ui/browser_commands.h" | 41 #include "chrome/browser/ui/browser_commands.h" |
43 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" | 42 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" |
44 #include "chrome/browser/ui/browser_instant_controller.h" | 43 #include "chrome/browser/ui/browser_instant_controller.h" |
45 #include "chrome/browser/ui/browser_list.h" | 44 #include "chrome/browser/ui/browser_list.h" |
(...skipping 2006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2052 } | 2051 } |
2053 | 2052 |
2054 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( | 2053 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( |
2055 ExtensionAction* action) { | 2054 ExtensionAction* action) { |
2056 ExtensionPopupGtk::Show( | 2055 ExtensionPopupGtk::Show( |
2057 action->GetPopupUrl(current_tab_id_), | 2056 action->GetPopupUrl(current_tab_id_), |
2058 owner_->browser_, | 2057 owner_->browser_, |
2059 event_box_.get(), | 2058 event_box_.get(), |
2060 ExtensionPopupGtk::SHOW_AND_INSPECT); | 2059 ExtensionPopupGtk::SHOW_AND_INSPECT); |
2061 } | 2060 } |
OLD | NEW |