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

Side by Side Diff: chrome/browser/views/location_bar/location_bar_view.h

Issue 3056003: Attemp 2 at: (Closed)
Patch Set: Fix chromeos breakage Created 10 years, 5 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_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 virtual void UpdatePageActions(); 204 virtual void UpdatePageActions();
205 virtual void InvalidatePageActions(); 205 virtual void InvalidatePageActions();
206 virtual void SaveStateToContents(TabContents* contents); 206 virtual void SaveStateToContents(TabContents* contents);
207 virtual void Revert(); 207 virtual void Revert();
208 virtual const AutocompleteEditView* location_entry() const { 208 virtual const AutocompleteEditView* location_entry() const {
209 return location_entry_.get(); 209 return location_entry_.get();
210 } 210 }
211 virtual AutocompleteEditView* location_entry() { 211 virtual AutocompleteEditView* location_entry() {
212 return location_entry_.get(); 212 return location_entry_.get();
213 } 213 }
214 virtual void PushForceHidden();
215 virtual void PopForceHidden();
216 virtual LocationBarTesting* GetLocationBarForTesting() { return this; } 214 virtual LocationBarTesting* GetLocationBarForTesting() { return this; }
217 215
218 // Overridden from LocationBarTesting: 216 // Overridden from LocationBarTesting:
219 virtual int PageActionCount() { return page_action_views_.size(); } 217 virtual int PageActionCount() { return page_action_views_.size(); }
220 virtual int PageActionVisibleCount(); 218 virtual int PageActionVisibleCount();
221 virtual ExtensionAction* GetPageAction(size_t index); 219 virtual ExtensionAction* GetPageAction(size_t index);
222 virtual ExtensionAction* GetVisiblePageAction(size_t index); 220 virtual ExtensionAction* GetVisiblePageAction(size_t index);
223 virtual void TestPageActionPressed(size_t index); 221 virtual void TestPageActionPressed(size_t index);
224 222
225 static const int kVertMargin; // Space above and below the edit. 223 static const int kVertMargin; // Space above and below the edit.
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 340
343 // The page action icon views. 341 // The page action icon views.
344 PageActionViews page_action_views_; 342 PageActionViews page_action_views_;
345 343
346 // The star. 344 // The star.
347 StarView* star_view_; 345 StarView* star_view_;
348 346
349 // The mode that dictates how the bar shows. 347 // The mode that dictates how the bar shows.
350 Mode mode_; 348 Mode mode_;
351 349
352 // Counts the number of times consumers have asked us to be hidden.
353 // We should actually be hidden iff this is greater than zero.
354 int force_hidden_count_;
355
356 // True if we should show a focus rect while the location entry field is 350 // True if we should show a focus rect while the location entry field is
357 // focused. Used when the toolbar is in full keyboard accessibility mode. 351 // focused. Used when the toolbar is in full keyboard accessibility mode.
358 bool show_focus_rect_; 352 bool show_focus_rect_;
359 353
360 #if defined(OS_LINUX) 354 #if defined(OS_LINUX)
361 scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_; 355 scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_;
362 #endif 356 #endif
363 357
364 // Used to schedule a task for the first run info bubble. 358 // Used to schedule a task for the first run info bubble.
365 ScopedRunnableMethodFactory<LocationBarView> first_run_bubble_; 359 ScopedRunnableMethodFactory<LocationBarView> first_run_bubble_;
366 360
367 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 361 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
368 }; 362 };
369 363
370 #endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 364 #endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/frame/opaque_browser_frame_view.cc ('k') | chrome/browser/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698