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

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

Issue 9703099: Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « chrome/browser/ui/views/reload_button.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::MenuButtonListener: 89 // Overridden from views::MenuButtonListener:
90 virtual void OnMenuButtonClicked(views::View* source, 90 virtual void OnMenuButtonClicked(views::View* source,
91 const gfx::Point& point) OVERRIDE; 91 const gfx::Point& point) OVERRIDE;
92 92
93 // Overridden from LocationBarView::Delegate: 93 // Overridden from LocationBarView::Delegate:
94 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE; 94 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE;
95 virtual InstantController* GetInstant() OVERRIDE; 95 virtual InstantController* GetInstant() OVERRIDE;
96 virtual views::Widget* CreateViewsBubble(
97 views::BubbleDelegateView* bubble_delegate) OVERRIDE;
98 virtual PageActionImageView* CreatePageActionImageView(
99 LocationBarView* owner, ExtensionAction* action) OVERRIDE;
100 virtual ContentSettingBubbleModelDelegate*
101 GetContentSettingBubbleModelDelegate() OVERRIDE;
102 virtual void ShowPageInfo(content::WebContents* web_contents,
103 const GURL& url,
104 const content::SSLStatus& ssl,
105 bool show_history) OVERRIDE;
106 virtual void OnInputInProgress(bool in_progress) OVERRIDE; 96 virtual void OnInputInProgress(bool in_progress) OVERRIDE;
107 97
108 // Overridden from CommandUpdater::CommandObserver: 98 // Overridden from CommandUpdater::CommandObserver:
109 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE; 99 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
110 100
111 // Overridden from views::ButtonListener: 101 // Overridden from views::ButtonListener:
112 virtual void ButtonPressed(views::Button* sender, 102 virtual void ButtonPressed(views::Button* sender,
113 const views::Event& event) OVERRIDE; 103 const views::Event& event) OVERRIDE;
114 104
115 // Overridden from content::NotificationObserver: 105 // Overridden from content::NotificationObserver:
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 203
214 // A list of listeners to call when the menu opens. 204 // A list of listeners to call when the menu opens.
215 ObserverList<views::MenuListener> menu_listeners_; 205 ObserverList<views::MenuListener> menu_listeners_;
216 206
217 content::NotificationRegistrar registrar_; 207 content::NotificationRegistrar registrar_;
218 208
219 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 209 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
220 }; 210 };
221 211
222 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 212 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/reload_button.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698