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

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

Issue 9479008: Re-factor location bar/toolbar code to get rid of the browser dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments fix Created 8 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_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 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // Overridden from AccessiblePaneView 85 // Overridden from AccessiblePaneView
86 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE; 86 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE;
87 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 87 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
88 88
89 // Overridden from views::ViewMenuDelegate: 89 // Overridden from views::ViewMenuDelegate:
90 virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; 90 virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
91 91
92 // Overridden from LocationBarView::Delegate: 92 // Overridden from LocationBarView::Delegate:
93 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE; 93 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE;
94 virtual InstantController* GetInstant() OVERRIDE; 94 virtual InstantController* GetInstant() OVERRIDE;
95 virtual views::Widget* CreateViewsBubble(
96 views::BubbleDelegateView* bubble_delegate) OVERRIDE;
97 virtual PageActionImageView* CreatePageActionImageView(
98 LocationBarView* owner, ExtensionAction* action) OVERRIDE;
99 virtual ContentSettingBubbleModelDelegate*
100 GetContentSettingBubbleModelDelegate() OVERRIDE;
101 virtual void ShowPageInfo(content::WebContents* web_contents,
102 const GURL& url,
103 const content::SSLStatus& ssl,
104 bool show_history) OVERRIDE;
95 virtual void OnInputInProgress(bool in_progress) OVERRIDE; 105 virtual void OnInputInProgress(bool in_progress) OVERRIDE;
96 106
97 // Overridden from CommandUpdater::CommandObserver: 107 // Overridden from CommandUpdater::CommandObserver:
98 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE; 108 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
99 109
100 // Overridden from views::BaseButton::ButtonListener: 110 // Overridden from views::BaseButton::ButtonListener:
101 virtual void ButtonPressed(views::Button* sender, const views::Event& event) 111 virtual void ButtonPressed(views::Button* sender, const views::Event& event)
102 OVERRIDE; 112 OVERRIDE;
103 113
104 // Overridden from content::NotificationObserver: 114 // Overridden from content::NotificationObserver:
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 212
203 // A list of listeners to call when the menu opens. 213 // A list of listeners to call when the menu opens.
204 ObserverList<views::MenuListener> menu_listeners_; 214 ObserverList<views::MenuListener> menu_listeners_;
205 215
206 content::NotificationRegistrar registrar_; 216 content::NotificationRegistrar registrar_;
207 217
208 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 218 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
209 }; 219 };
210 220
211 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 221 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698