Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: chrome/browser/ui/gtk/location_bar_view_gtk.cc

Issue 10911300: Move ExtensionAction from common/ to browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: proof of concept Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" 65 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
66 #include "chrome/browser/ui/omnibox/location_bar_util.h" 66 #include "chrome/browser/ui/omnibox/location_bar_util.h"
67 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" 67 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
68 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" 68 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
69 #include "chrome/browser/ui/tab_contents/tab_contents.h" 69 #include "chrome/browser/ui/tab_contents/tab_contents.h"
70 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h" 70 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"
71 #include "chrome/browser/ui/zoom/zoom_controller.h" 71 #include "chrome/browser/ui/zoom/zoom_controller.h"
72 #include "chrome/common/chrome_notification_types.h" 72 #include "chrome/common/chrome_notification_types.h"
73 #include "chrome/common/chrome_switches.h" 73 #include "chrome/common/chrome_switches.h"
74 #include "chrome/common/extensions/extension.h" 74 #include "chrome/common/extensions/extension.h"
75 #include "chrome/common/extensions/extension_action.h" 75 #include "chrome/browser/extensions/extension_action.h"
76 #include "chrome/common/extensions/extension_manifest_constants.h" 76 #include "chrome/common/extensions/extension_manifest_constants.h"
77 #include "chrome/common/extensions/extension_resource.h" 77 #include "chrome/common/extensions/extension_resource.h"
78 #include "chrome/common/extensions/extension_switch_utils.h" 78 #include "chrome/common/extensions/extension_switch_utils.h"
79 #include "chrome/common/pref_names.h" 79 #include "chrome/common/pref_names.h"
80 #include "content/public/browser/navigation_entry.h" 80 #include "content/public/browser/navigation_entry.h"
81 #include "content/public/browser/notification_service.h" 81 #include "content/public/browser/notification_service.h"
82 #include "content/public/browser/web_contents.h" 82 #include "content/public/browser/web_contents.h"
83 #include "grit/generated_resources.h" 83 #include "grit/generated_resources.h"
84 #include "grit/theme_resources.h" 84 #include "grit/theme_resources.h"
85 #include "net/base/net_util.h" 85 #include "net/base/net_util.h"
(...skipping 2028 matching lines...) Expand 10 before | Expand all | Expand 10 after
2114 } 2114 }
2115 2115
2116 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( 2116 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
2117 ExtensionAction* action) { 2117 ExtensionAction* action) {
2118 ExtensionPopupGtk::Show( 2118 ExtensionPopupGtk::Show(
2119 action->GetPopupUrl(current_tab_id_), 2119 action->GetPopupUrl(current_tab_id_),
2120 owner_->browser_, 2120 owner_->browser_,
2121 event_box_.get(), 2121 event_box_.get(),
2122 ExtensionPopupGtk::SHOW_AND_INSPECT); 2122 ExtensionPopupGtk::SHOW_AND_INSPECT);
2123 } 2123 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698