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

Side by Side Diff: chrome/browser/ui/views/toolbar_view.h

Issue 15745031: Restyle omnibox popup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Go back to 3 max search suggestions for now Created 7 years, 6 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_VIEWS_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 28 matching lines...) Expand all
39 public ui::AcceleratorProvider, 39 public ui::AcceleratorProvider,
40 public LocationBarView::Delegate, 40 public LocationBarView::Delegate,
41 public content::NotificationObserver, 41 public content::NotificationObserver,
42 public CommandObserver, 42 public CommandObserver,
43 public views::ButtonListener, 43 public views::ButtonListener,
44 public views::WidgetObserver { 44 public views::WidgetObserver {
45 public: 45 public:
46 // The view class name. 46 // The view class name.
47 static const char kViewClassName[]; 47 static const char kViewClassName[];
48 48
49 // This takes a pointer to the page contents view this is used to position
50 // the omnibox popup.
Peter Kasting 2013/06/06 18:52:16 This sentence is a run on sentence this is. Also
49 explicit ToolbarView(Browser* browser); 51 explicit ToolbarView(Browser* browser);
50 virtual ~ToolbarView(); 52 virtual ~ToolbarView();
51 53
52 // Create the contents of the Browser Toolbar. 54 // Create the contents of the Browser Toolbar.
53 void Init(); 55 void Init();
54 56
55 // Updates the toolbar (and transitively the location bar) with the states of 57 // Updates the toolbar (and transitively the location bar) with the states of
56 // the specified |tab|. If |should_restore_state| is true, we're switching 58 // the specified |tab|. If |should_restore_state| is true, we're switching
57 // (back?) to this tab and should restore any previous location bar state 59 // (back?) to this tab and should restore any previous location bar state
58 // (such as user editing) as well. 60 // (such as user editing) as well.
(...skipping 29 matching lines...) Expand all
88 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE; 90 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE;
89 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 91 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
90 92
91 // Overridden from views::MenuButtonListener: 93 // Overridden from views::MenuButtonListener:
92 virtual void OnMenuButtonClicked(views::View* source, 94 virtual void OnMenuButtonClicked(views::View* source,
93 const gfx::Point& point) OVERRIDE; 95 const gfx::Point& point) OVERRIDE;
94 96
95 // Overridden from LocationBarView::Delegate: 97 // Overridden from LocationBarView::Delegate:
96 virtual content::WebContents* GetWebContents() const OVERRIDE; 98 virtual content::WebContents* GetWebContents() const OVERRIDE;
97 virtual InstantController* GetInstant() OVERRIDE; 99 virtual InstantController* GetInstant() OVERRIDE;
100 virtual void GetOmniboxPopupPositioningInfo(
101 gfx::Point* top_left_screen_coord,
102 int* popup_width,
103 int* left_margin,
104 int* right_margin) OVERRIDE;
98 virtual views::Widget* CreateViewsBubble( 105 virtual views::Widget* CreateViewsBubble(
99 views::BubbleDelegateView* bubble_delegate) OVERRIDE; 106 views::BubbleDelegateView* bubble_delegate) OVERRIDE;
100 virtual PageActionImageView* CreatePageActionImageView( 107 virtual PageActionImageView* CreatePageActionImageView(
101 LocationBarView* owner, ExtensionAction* action) OVERRIDE; 108 LocationBarView* owner, ExtensionAction* action) OVERRIDE;
102 virtual ContentSettingBubbleModelDelegate* 109 virtual ContentSettingBubbleModelDelegate*
103 GetContentSettingBubbleModelDelegate() OVERRIDE; 110 GetContentSettingBubbleModelDelegate() OVERRIDE;
104 virtual void ShowWebsiteSettings(content::WebContents* web_contents, 111 virtual void ShowWebsiteSettings(content::WebContents* web_contents,
105 const GURL& url, 112 const GURL& url,
106 const content::SSLStatus& ssl, 113 const content::SSLStatus& ssl,
107 bool show_history) OVERRIDE; 114 bool show_history) OVERRIDE;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 230
224 // A list of listeners to call when the menu opens. 231 // A list of listeners to call when the menu opens.
225 ObserverList<views::MenuListener> menu_listeners_; 232 ObserverList<views::MenuListener> menu_listeners_;
226 233
227 content::NotificationRegistrar registrar_; 234 content::NotificationRegistrar registrar_;
228 235
229 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 236 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
230 }; 237 };
231 238
232 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 239 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698