| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; | 226 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; |
| 227 virtual PageTransition::Type GetPageTransition() const OVERRIDE; | 227 virtual PageTransition::Type GetPageTransition() const OVERRIDE; |
| 228 virtual void AcceptInput() OVERRIDE; | 228 virtual void AcceptInput() OVERRIDE; |
| 229 virtual void FocusLocation(bool select_all) OVERRIDE; | 229 virtual void FocusLocation(bool select_all) OVERRIDE; |
| 230 virtual void FocusSearch() OVERRIDE; | 230 virtual void FocusSearch() OVERRIDE; |
| 231 virtual void UpdateContentSettingsIcons() OVERRIDE; | 231 virtual void UpdateContentSettingsIcons() OVERRIDE; |
| 232 virtual void UpdatePageActions() OVERRIDE; | 232 virtual void UpdatePageActions() OVERRIDE; |
| 233 virtual void InvalidatePageActions() OVERRIDE; | 233 virtual void InvalidatePageActions() OVERRIDE; |
| 234 virtual void SaveStateToContents(TabContents* contents) OVERRIDE; | 234 virtual void SaveStateToContents(TabContents* contents) OVERRIDE; |
| 235 virtual void Revert() OVERRIDE; | 235 virtual void Revert() OVERRIDE; |
| 236 virtual const AutocompleteEditView* location_entry() const OVERRIDE { | 236 virtual const AutocompleteEditView* location_entry() const OVERRIDE; |
| 237 return location_entry_.get(); | 237 virtual AutocompleteEditView* location_entry() OVERRIDE; |
| 238 } | 238 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; |
| 239 virtual AutocompleteEditView* location_entry() OVERRIDE { | |
| 240 return location_entry_.get(); | |
| 241 } | |
| 242 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE { | |
| 243 return this; | |
| 244 } | |
| 245 | 239 |
| 246 // Overridden from LocationBarTesting: | 240 // Overridden from LocationBarTesting: |
| 247 virtual int PageActionCount() OVERRIDE { return page_action_views_.size(); } | 241 virtual int PageActionCount() OVERRIDE; |
| 248 virtual int PageActionVisibleCount() OVERRIDE; | 242 virtual int PageActionVisibleCount() OVERRIDE; |
| 249 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE; | 243 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE; |
| 250 virtual ExtensionAction* GetVisiblePageAction(size_t index) OVERRIDE; | 244 virtual ExtensionAction* GetVisiblePageAction(size_t index) OVERRIDE; |
| 251 virtual void TestPageActionPressed(size_t index) OVERRIDE; | 245 virtual void TestPageActionPressed(size_t index) OVERRIDE; |
| 252 | 246 |
| 253 // Overridden from TemplateURLModelObserver | 247 // Overridden from TemplateURLModelObserver |
| 254 virtual void OnTemplateURLModelChanged() OVERRIDE; | 248 virtual void OnTemplateURLModelChanged() OVERRIDE; |
| 255 | 249 |
| 256 // Thickness of the left and right edges of the omnibox, in normal mode. | 250 // Thickness of the left and right edges of the omnibox, in normal mode. |
| 257 static const int kNormalHorizontalEdgeThickness; | 251 static const int kNormalHorizontalEdgeThickness; |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 // Should instant be updated? This is set to false in OnAutocompleteWillAccept | 401 // Should instant be updated? This is set to false in OnAutocompleteWillAccept |
| 408 // and true in OnAutocompleteAccept. This is needed as prior to accepting an | 402 // and true in OnAutocompleteAccept. This is needed as prior to accepting an |
| 409 // autocomplete suggestion the model is reverted which triggers resetting | 403 // autocomplete suggestion the model is reverted which triggers resetting |
| 410 // instant. | 404 // instant. |
| 411 bool update_instant_; | 405 bool update_instant_; |
| 412 | 406 |
| 413 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); | 407 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); |
| 414 }; | 408 }; |
| 415 | 409 |
| 416 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 410 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |