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

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

Issue 200783003: [OriginChip] Add animations for the hiding and showing of the chip. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to comments, merge Created 6 years, 9 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 return manage_passwords_icon_.get(); 105 return manage_passwords_icon_.get();
106 } 106 }
107 107
108 // Set the starred state of the bookmark star. 108 // Set the starred state of the bookmark star.
109 void SetStarred(bool starred); 109 void SetStarred(bool starred);
110 110
111 // OmniboxEditController: 111 // OmniboxEditController:
112 virtual void Update(const content::WebContents* contents) OVERRIDE; 112 virtual void Update(const content::WebContents* contents) OVERRIDE;
113 virtual void OnChanged() OVERRIDE; 113 virtual void OnChanged() OVERRIDE;
114 virtual void OnSetFocus() OVERRIDE; 114 virtual void OnSetFocus() OVERRIDE;
115 virtual void ShowURL() OVERRIDE;
115 virtual InstantController* GetInstant() OVERRIDE; 116 virtual InstantController* GetInstant() OVERRIDE;
116 virtual content::WebContents* GetWebContents() OVERRIDE; 117 virtual content::WebContents* GetWebContents() OVERRIDE;
117 virtual ToolbarModel* GetToolbarModel() OVERRIDE; 118 virtual ToolbarModel* GetToolbarModel() OVERRIDE;
118 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE; 119 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE;
119 120
120 // LocationBar: 121 // LocationBar:
121 virtual void ShowFirstRunBubble() OVERRIDE; 122 virtual void ShowFirstRunBubble() OVERRIDE;
122 virtual GURL GetDestinationURL() const OVERRIDE; 123 virtual GURL GetDestinationURL() const OVERRIDE;
123 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 124 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
124 virtual content::PageTransition GetPageTransition() const OVERRIDE; 125 virtual content::PageTransition GetPageTransition() const OVERRIDE;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 204
204 // The label's default requisition (cached so we can animate accordingly). 205 // The label's default requisition (cached so we can animate accordingly).
205 GtkRequisition label_req_; 206 GtkRequisition label_req_;
206 207
207 base::WeakPtrFactory<PageToolViewGtk> weak_factory_; 208 base::WeakPtrFactory<PageToolViewGtk> weak_factory_;
208 209
209 private: 210 private:
210 DISALLOW_COPY_AND_ASSIGN(PageToolViewGtk); 211 DISALLOW_COPY_AND_ASSIGN(PageToolViewGtk);
211 }; 212 };
212 213
214 protected:
215 // OmniboxEditController:
216 virtual void HideURL() OVERRIDE;
217
213 private: 218 private:
214 class PageActionViewGtk : 219 class PageActionViewGtk :
215 public ExtensionActionIconFactory::Observer, 220 public ExtensionActionIconFactory::Observer,
216 public content::NotificationObserver, 221 public content::NotificationObserver,
217 public ExtensionContextMenuModel::PopupDelegate { 222 public ExtensionContextMenuModel::PopupDelegate {
218 public: 223 public:
219 PageActionViewGtk(LocationBarViewGtk* owner, ExtensionAction* page_action); 224 PageActionViewGtk(LocationBarViewGtk* owner, ExtensionAction* page_action);
220 virtual ~PageActionViewGtk(); 225 virtual ~PageActionViewGtk();
221 226
222 GtkWidget* widget() { return event_box_.get(); } 227 GtkWidget* widget() { return event_box_.get(); }
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 GURL drag_url_; 502 GURL drag_url_;
498 base::string16 drag_title_; 503 base::string16 drag_title_;
499 504
500 // Used to schedule a task for the first run bubble. 505 // Used to schedule a task for the first run bubble.
501 base::WeakPtrFactory<LocationBarViewGtk> weak_ptr_factory_; 506 base::WeakPtrFactory<LocationBarViewGtk> weak_ptr_factory_;
502 507
503 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); 508 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
504 }; 509 };
505 510
506 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 511 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698