chrome/browser/ui/gtk/location_bar_view_gtk.h - Issue 10796116: [Web Intents] Basic location bar UI for window disposition picker affordance.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/location_bar_view_gtk.h

diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h

index cccbc0bbff5f2cb38f900db996d57d747a35251c..89838d74bcc26ff7bc11a2e4e5c8136e43657a59 100644

--- a/chrome/browser/ui/gtk/location_bar_view_gtk.h

+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h

@@ -144,6 +144,7 @@ class LocationBarViewGtk : public OmniboxEditController,

virtual void UpdateContentSettingsIcons() OVERRIDE;

virtual void UpdatePageActions() OVERRIDE;

virtual void InvalidatePageActions() OVERRIDE;

+ virtual void UpdateWebIntentsTool() OVERRIDE;

virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE;

virtual void Revert() OVERRIDE;

virtual const OmniboxView* GetLocationEntry() const OVERRIDE;

@@ -469,6 +470,10 @@ class LocationBarViewGtk : public OmniboxEditController,

ui::OwnedWidgetGtk page_action_hbox_;

ScopedVector<PageActionViewGtk> page_action_views_;

+ // Control for web intents window disposition picker control.

+ ui::OwnedWidgetGtk web_intents_hbox_;

+ scoped_ptr<PageToolViewGtk> web_intents_button_view_;

// The widget that contains our tab hints and the location bar.

GtkWidget* entry_box_;