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

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

Issue 3332022: Bunch of match preview tweaks: (Closed)
Patch Set: Add string16 include Created 10 years, 3 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
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_VIEWS_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 virtual bool SetToolbarFocus(int view_storage_id, View* initial_focus); 81 virtual bool SetToolbarFocus(int view_storage_id, View* initial_focus);
82 82
83 // Overridden from Menu::BaseControllerDelegate: 83 // Overridden from Menu::BaseControllerDelegate:
84 virtual bool GetAcceleratorInfo(int id, menus::Accelerator* accel); 84 virtual bool GetAcceleratorInfo(int id, menus::Accelerator* accel);
85 85
86 // Overridden from views::MenuDelegate: 86 // Overridden from views::MenuDelegate:
87 virtual void RunMenu(views::View* source, const gfx::Point& pt); 87 virtual void RunMenu(views::View* source, const gfx::Point& pt);
88 88
89 // Overridden from LocationBarView::Delegate: 89 // Overridden from LocationBarView::Delegate:
90 virtual TabContents* GetTabContents(); 90 virtual TabContents* GetTabContents();
91 virtual MatchPreview* GetMatchPreview();
91 virtual void OnInputInProgress(bool in_progress); 92 virtual void OnInputInProgress(bool in_progress);
92 93
93 // Overridden from AnimationDelegate: 94 // Overridden from AnimationDelegate:
94 virtual void AnimationProgressed(const Animation* animation); 95 virtual void AnimationProgressed(const Animation* animation);
95 96
96 // Overridden from CommandUpdater::CommandObserver: 97 // Overridden from CommandUpdater::CommandObserver:
97 virtual void EnabledStateChangedForCommand(int id, bool enabled); 98 virtual void EnabledStateChangedForCommand(int id, bool enabled);
98 99
99 // Overridden from views::BaseButton::ButtonListener: 100 // Overridden from views::BaseButton::ButtonListener:
100 virtual void ButtonPressed(views::Button* sender, const views::Event& event); 101 virtual void ButtonPressed(views::Button* sender, const views::Event& event);
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 205
205 // If non-null the destructor sets this to true. This is set to a non-null 206 // If non-null the destructor sets this to true. This is set to a non-null
206 // while the menu is showing and used to detect if the menu was deleted while 207 // while the menu is showing and used to detect if the menu was deleted while
207 // running. 208 // running.
208 bool* destroyed_flag_; 209 bool* destroyed_flag_;
209 210
210 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 211 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
211 }; 212 };
212 213
213 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 214 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/location_bar/location_bar_view.cc ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698