Chromium Code Reviews

Side by Side Diff: chrome/browser/gtk/location_bar_view_gtk.h

Issue 1725011: GTK: Add a drag icon for site icon drags. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 // Copyright (c) 2010 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 #ifndef CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_ 5 #ifndef CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
6 #define CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_ 6 #define CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 260 matching lines...)
271 void SetSiteTypeDragSource(); 271 void SetSiteTypeDragSource();
272 272
273 GtkWidget* site_type_area() { return site_type_alignment_; } 273 GtkWidget* site_type_area() { return site_type_alignment_; }
274 274
275 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, HandleExpose, 275 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, HandleExpose,
276 GdkEventExpose*); 276 GdkEventExpose*);
277 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, OnIconReleased, 277 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, OnIconReleased,
278 GdkEventButton*); 278 GdkEventButton*);
279 CHROMEGTK_CALLBACK_4(LocationBarViewGtk, void, OnIconDragData, 279 CHROMEGTK_CALLBACK_4(LocationBarViewGtk, void, OnIconDragData,
280 GdkDragContext*, GtkSelectionData*, guint, guint); 280 GdkDragContext*, GtkSelectionData*, guint, guint);
281 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, void, OnIconDragBegin,
282 GdkDragContext*);
283 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, OnDragIconExpose,
284 GdkEventExpose*);
281 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, void, OnEntryBoxSizeAllocate, 285 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, void, OnEntryBoxSizeAllocate,
282 GtkAllocation*); 286 GtkAllocation*);
283 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, OnStarButtonPress, 287 CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, OnStarButtonPress,
284 GdkEventButton*); 288 GdkEventButton*);
285 289
286 // Updates the site type area: changes the icon and shows/hides the EV 290 // Updates the site type area: changes the icon and shows/hides the EV
287 // certificate information. 291 // certificate information.
288 void UpdateSiteTypeArea(); 292 void UpdateSiteTypeArea();
289 293
290 // Sets the text that should be displayed in the info label and its associated 294 // Sets the text that should be displayed in the info label and its associated
(...skipping 35 matching lines...)
326 // SSL state. 330 // SSL state.
327 GtkWidget* security_icon_event_box_; 331 GtkWidget* security_icon_event_box_;
328 GtkWidget* ev_secure_icon_image_; 332 GtkWidget* ev_secure_icon_image_;
329 GtkWidget* secure_icon_image_; 333 GtkWidget* secure_icon_image_;
330 GtkWidget* security_warning_icon_image_; 334 GtkWidget* security_warning_icon_image_;
331 GtkWidget* security_error_icon_image_; 335 GtkWidget* security_error_icon_image_;
332 // An icon to the left of the address bar. 336 // An icon to the left of the address bar.
333 GtkWidget* site_type_alignment_; 337 GtkWidget* site_type_alignment_;
334 GtkWidget* site_type_event_box_; 338 GtkWidget* site_type_event_box_;
335 GtkWidget* location_icon_image_; 339 GtkWidget* location_icon_image_;
340 OwnedWidgetGtk drag_icon_;
336 bool enable_location_drag_; 341 bool enable_location_drag_;
337 // TODO(pkasting): Split this label off and move the rest of the items to the 342 // TODO(pkasting): Split this label off and move the rest of the items to the
338 // left of the address bar. 343 // left of the address bar.
339 GtkWidget* security_info_label_; 344 GtkWidget* security_info_label_;
340 345
341 // Content setting icons. 346 // Content setting icons.
342 OwnedWidgetGtk content_setting_hbox_; 347 OwnedWidgetGtk content_setting_hbox_;
343 ScopedVector<ContentSettingImageViewGtk> content_setting_views_; 348 ScopedVector<ContentSettingImageViewGtk> content_setting_views_;
344 349
345 // Extension page action icons. 350 // Extension page action icons.
(...skipping 48 matching lines...)
394 // Indicate if |tab_to_search_box_| should be shown. 399 // Indicate if |tab_to_search_box_| should be shown.
395 bool show_selected_keyword_; 400 bool show_selected_keyword_;
396 401
397 // Indicate if |tab_to_search_hint_| should be shown. 402 // Indicate if |tab_to_search_hint_| should be shown.
398 bool show_keyword_hint_; 403 bool show_keyword_hint_;
399 404
400 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); 405 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
401 }; 406 };
402 407
403 #endif // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_ 408 #endif // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/gtk/location_bar_view_gtk.cc » ('j') | chrome/browser/gtk/location_bar_view_gtk.cc » ('J')

Powered by Google App Engine