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

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

Issue 229813002: Move extensions manifest IconsHandler to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (icons-handler) Created 6 years, 8 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 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include "chrome/browser/ui/gtk/zoom_bubble_gtk.h" 65 #include "chrome/browser/ui/gtk/zoom_bubble_gtk.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/passwords/manage_passwords_bubble_ui_controller.h" 69 #include "chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h"
70 #include "chrome/browser/ui/tabs/tab_strip_model.h" 70 #include "chrome/browser/ui/tabs/tab_strip_model.h"
71 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h" 71 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"
72 #include "chrome/browser/ui/zoom/zoom_controller.h" 72 #include "chrome/browser/ui/zoom/zoom_controller.h"
73 #include "chrome/common/badge_util.h" 73 #include "chrome/common/badge_util.h"
74 #include "chrome/common/chrome_switches.h" 74 #include "chrome/common/chrome_switches.h"
75 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
76 #include "chrome/common/pref_names.h" 75 #include "chrome/common/pref_names.h"
77 #include "content/public/browser/navigation_entry.h" 76 #include "content/public/browser/navigation_entry.h"
78 #include "content/public/browser/notification_service.h" 77 #include "content/public/browser/notification_service.h"
79 #include "content/public/browser/web_contents.h" 78 #include "content/public/browser/web_contents.h"
80 #include "extensions/common/extension.h" 79 #include "extensions/common/extension.h"
81 #include "extensions/common/feature_switch.h" 80 #include "extensions/common/feature_switch.h"
81 #include "extensions/common/manifest_handlers/icons_handler.h"
82 #include "grit/generated_resources.h" 82 #include "grit/generated_resources.h"
83 #include "grit/theme_resources.h" 83 #include "grit/theme_resources.h"
84 #include "net/base/net_util.h" 84 #include "net/base/net_util.h"
85 #include "ui/accessibility/ax_enums.h" 85 #include "ui/accessibility/ax_enums.h"
86 #include "ui/base/accelerators/platform_accelerator_gtk.h" 86 #include "ui/base/accelerators/platform_accelerator_gtk.h"
87 #include "ui/base/dragdrop/gtk_dnd_util.h" 87 #include "ui/base/dragdrop/gtk_dnd_util.h"
88 #include "ui/base/gtk/gtk_hig_constants.h" 88 #include "ui/base/gtk/gtk_hig_constants.h"
89 #include "ui/base/gtk/gtk_signal_registrar.h" 89 #include "ui/base/gtk/gtk_signal_registrar.h"
90 #include "ui/base/l10n/l10n_util.h" 90 #include "ui/base/l10n/l10n_util.h"
91 #include "ui/base/resource/resource_bundle.h" 91 #include "ui/base/resource/resource_bundle.h"
(...skipping 1622 matching lines...) Expand 10 before | Expand all | Expand 10 after
1714 LocationBarViewGtk* owner, 1714 LocationBarViewGtk* owner,
1715 ExtensionAction* page_action) 1715 ExtensionAction* page_action)
1716 : owner_(NULL), 1716 : owner_(NULL),
1717 page_action_(page_action), 1717 page_action_(page_action),
1718 current_tab_id_(-1), 1718 current_tab_id_(-1),
1719 window_(NULL), 1719 window_(NULL),
1720 accel_group_(NULL), 1720 accel_group_(NULL),
1721 preview_enabled_(false) { 1721 preview_enabled_(false) {
1722 event_box_.Own(gtk_event_box_new()); 1722 event_box_.Own(gtk_event_box_new());
1723 gtk_widget_set_size_request(event_box_.get(), 1723 gtk_widget_set_size_request(event_box_.get(),
1724 extensions::IconsInfo::kPageActionIconMaxSize, 1724 ExtensionAction::kPageActionIconMaxSize,
1725 extensions::IconsInfo::kPageActionIconMaxSize); 1725 ExtensionAction::kPageActionIconMaxSize);
1726 1726
1727 // Make the event box not visible so it does not paint a background. 1727 // Make the event box not visible so it does not paint a background.
1728 gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_.get()), FALSE); 1728 gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_.get()), FALSE);
1729 g_signal_connect(event_box_.get(), "button-press-event", 1729 g_signal_connect(event_box_.get(), "button-press-event",
1730 G_CALLBACK(&OnButtonPressedThunk), this); 1730 G_CALLBACK(&OnButtonPressedThunk), this);
1731 g_signal_connect_after(event_box_.get(), "expose-event", 1731 g_signal_connect_after(event_box_.get(), "expose-event",
1732 G_CALLBACK(OnExposeEventThunk), this); 1732 G_CALLBACK(OnExposeEventThunk), this);
1733 g_signal_connect(event_box_.get(), "realize", 1733 g_signal_connect(event_box_.get(), "realize",
1734 G_CALLBACK(OnRealizeThunk), this); 1734 G_CALLBACK(OnRealizeThunk), this);
1735 1735
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1971 void* user_data) { 1971 void* user_data) {
1972 PageActionViewGtk* view = static_cast<PageActionViewGtk*>(user_data); 1972 PageActionViewGtk* view = static_cast<PageActionViewGtk*>(user_data);
1973 if (!gtk_widget_get_visible(view->widget())) 1973 if (!gtk_widget_get_visible(view->widget()))
1974 return FALSE; 1974 return FALSE;
1975 1975
1976 GdkEventButton event = {}; 1976 GdkEventButton event = {};
1977 event.type = GDK_BUTTON_PRESS; 1977 event.type = GDK_BUTTON_PRESS;
1978 event.button = 1; 1978 event.button = 1;
1979 return view->OnButtonPressed(view->widget(), &event); 1979 return view->OnButtonPressed(view->widget(), &event);
1980 } 1980 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc ('k') | chrome/browser/ui/panels/panel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698