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

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

Issue 10796116: [Web Intents] Basic location bar UI for window disposition picker affordance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge Created 8 years, 4 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 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 6 #define CHROME_BROWSER_UI_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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 InstantCompleteBehavior behavior) OVERRIDE; 137 InstantCompleteBehavior behavior) OVERRIDE;
138 virtual string16 GetInputString() const OVERRIDE; 138 virtual string16 GetInputString() const OVERRIDE;
139 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 139 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
140 virtual content::PageTransition GetPageTransition() const OVERRIDE; 140 virtual content::PageTransition GetPageTransition() const OVERRIDE;
141 virtual void AcceptInput() OVERRIDE; 141 virtual void AcceptInput() OVERRIDE;
142 virtual void FocusLocation(bool select_all) OVERRIDE; 142 virtual void FocusLocation(bool select_all) OVERRIDE;
143 virtual void FocusSearch() OVERRIDE; 143 virtual void FocusSearch() OVERRIDE;
144 virtual void UpdateContentSettingsIcons() OVERRIDE; 144 virtual void UpdateContentSettingsIcons() OVERRIDE;
145 virtual void UpdatePageActions() OVERRIDE; 145 virtual void UpdatePageActions() OVERRIDE;
146 virtual void InvalidatePageActions() OVERRIDE; 146 virtual void InvalidatePageActions() OVERRIDE;
147 virtual void UpdateWebIntentsTool() OVERRIDE;
147 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; 148 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE;
148 virtual void Revert() OVERRIDE; 149 virtual void Revert() OVERRIDE;
149 virtual const OmniboxView* GetLocationEntry() const OVERRIDE; 150 virtual const OmniboxView* GetLocationEntry() const OVERRIDE;
150 virtual OmniboxView* GetLocationEntry() OVERRIDE; 151 virtual OmniboxView* GetLocationEntry() OVERRIDE;
151 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; 152 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
152 153
153 // LocationBarTesting: 154 // LocationBarTesting:
154 virtual int PageActionCount() OVERRIDE; 155 virtual int PageActionCount() OVERRIDE;
155 virtual int PageActionVisibleCount() OVERRIDE; 156 virtual int PageActionVisibleCount() OVERRIDE;
156 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE; 157 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE;
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 ui::OwnedWidgetGtk content_setting_hbox_; 463 ui::OwnedWidgetGtk content_setting_hbox_;
463 ScopedVector<PageToolViewGtk> content_setting_views_; 464 ScopedVector<PageToolViewGtk> content_setting_views_;
464 465
465 // Extension page actions. 466 // Extension page actions.
466 std::vector<ExtensionAction*> page_actions_; 467 std::vector<ExtensionAction*> page_actions_;
467 468
468 // Extension page action icons. 469 // Extension page action icons.
469 ui::OwnedWidgetGtk page_action_hbox_; 470 ui::OwnedWidgetGtk page_action_hbox_;
470 ScopedVector<PageActionViewGtk> page_action_views_; 471 ScopedVector<PageActionViewGtk> page_action_views_;
471 472
473 // Control for web intents window disposition picker control.
474 ui::OwnedWidgetGtk web_intents_hbox_;
475 scoped_ptr<PageToolViewGtk> web_intents_button_view_;
476
472 // The widget that contains our tab hints and the location bar. 477 // The widget that contains our tab hints and the location bar.
473 GtkWidget* entry_box_; 478 GtkWidget* entry_box_;
474 479
475 // Area on the left shown when in tab to search mode. 480 // Area on the left shown when in tab to search mode.
476 GtkWidget* tab_to_search_alignment_; 481 GtkWidget* tab_to_search_alignment_;
477 GtkWidget* tab_to_search_box_; 482 GtkWidget* tab_to_search_box_;
478 GtkWidget* tab_to_search_magnifier_; 483 GtkWidget* tab_to_search_magnifier_;
479 GtkWidget* tab_to_search_full_label_; 484 GtkWidget* tab_to_search_full_label_;
480 GtkWidget* tab_to_search_partial_label_; 485 GtkWidget* tab_to_search_partial_label_;
481 486
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 BooleanPrefMember edit_bookmarks_enabled_; 542 BooleanPrefMember edit_bookmarks_enabled_;
538 543
539 // Used to remember the URL and title text when drag&drop has begun. 544 // Used to remember the URL and title text when drag&drop has begun.
540 GURL drag_url_; 545 GURL drag_url_;
541 string16 drag_title_; 546 string16 drag_title_;
542 547
543 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); 548 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
544 }; 549 };
545 550
546 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 551 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698