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

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

Issue 4694008: Make pink's TabContentsWrapper change compile on Windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <vector> 9 #include <vector>
10 10
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 virtual bool SetPaneFocus(int view_storage_id, View* initial_focus); 89 virtual bool SetPaneFocus(int view_storage_id, View* initial_focus);
90 virtual AccessibilityTypes::Role GetAccessibleRole(); 90 virtual AccessibilityTypes::Role GetAccessibleRole();
91 91
92 // Overridden from Menu::BaseControllerDelegate: 92 // Overridden from Menu::BaseControllerDelegate:
93 virtual bool GetAcceleratorInfo(int id, menus::Accelerator* accel); 93 virtual bool GetAcceleratorInfo(int id, menus::Accelerator* accel);
94 94
95 // Overridden from views::MenuDelegate: 95 // Overridden from views::MenuDelegate:
96 virtual void RunMenu(views::View* source, const gfx::Point& pt); 96 virtual void RunMenu(views::View* source, const gfx::Point& pt);
97 97
98 // Overridden from LocationBarView::Delegate: 98 // Overridden from LocationBarView::Delegate:
99 virtual TabContents* GetTabContents(); 99 virtual TabContentsWrapper* GetTabContentsWrapper();
100 virtual InstantController* GetInstant(); 100 virtual InstantController* GetInstant();
101 virtual void OnInputInProgress(bool in_progress); 101 virtual void OnInputInProgress(bool in_progress);
102 102
103 // Overridden from CommandUpdater::CommandObserver: 103 // Overridden from CommandUpdater::CommandObserver:
104 virtual void EnabledStateChangedForCommand(int id, bool enabled); 104 virtual void EnabledStateChangedForCommand(int id, bool enabled);
105 105
106 // Overridden from views::BaseButton::ButtonListener: 106 // Overridden from views::BaseButton::ButtonListener:
107 virtual void ButtonPressed(views::Button* sender, const views::Event& event); 107 virtual void ButtonPressed(views::Button* sender, const views::Event& event);
108 108
109 // Overridden from NotificationObserver: 109 // Overridden from NotificationObserver:
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 212
213 // If non-null the destructor sets this to true. This is set to a non-null 213 // If non-null the destructor sets this to true. This is set to a non-null
214 // while the menu is showing and used to detect if the menu was deleted while 214 // while the menu is showing and used to detect if the menu was deleted while
215 // running. 215 // running.
216 bool* destroyed_flag_; 216 bool* destroyed_flag_;
217 217
218 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 218 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
219 }; 219 };
220 220
221 #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