| OLD | NEW |
| 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_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 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 InstantCompleteBehavior behavior) OVERRIDE; | 314 InstantCompleteBehavior behavior) OVERRIDE; |
| 315 virtual string16 GetInputString() const OVERRIDE; | 315 virtual string16 GetInputString() const OVERRIDE; |
| 316 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; | 316 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; |
| 317 virtual content::PageTransition GetPageTransition() const OVERRIDE; | 317 virtual content::PageTransition GetPageTransition() const OVERRIDE; |
| 318 virtual void AcceptInput() OVERRIDE; | 318 virtual void AcceptInput() OVERRIDE; |
| 319 virtual void FocusLocation(bool select_all) OVERRIDE; | 319 virtual void FocusLocation(bool select_all) OVERRIDE; |
| 320 virtual void FocusSearch() OVERRIDE; | 320 virtual void FocusSearch() OVERRIDE; |
| 321 virtual void UpdateContentSettingsIcons() OVERRIDE; | 321 virtual void UpdateContentSettingsIcons() OVERRIDE; |
| 322 virtual void UpdatePageActions() OVERRIDE; | 322 virtual void UpdatePageActions() OVERRIDE; |
| 323 virtual void InvalidatePageActions() OVERRIDE; | 323 virtual void InvalidatePageActions() OVERRIDE; |
| 324 virtual void UpdateWebIntentsButton() OVERRIDE; |
| 324 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; | 325 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; |
| 325 virtual void Revert() OVERRIDE; | 326 virtual void Revert() OVERRIDE; |
| 326 virtual const OmniboxView* GetLocationEntry() const OVERRIDE; | 327 virtual const OmniboxView* GetLocationEntry() const OVERRIDE; |
| 327 virtual OmniboxView* GetLocationEntry() OVERRIDE; | 328 virtual OmniboxView* GetLocationEntry() OVERRIDE; |
| 328 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; | 329 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; |
| 329 | 330 |
| 330 // Overridden from LocationBarTesting: | 331 // Overridden from LocationBarTesting: |
| 331 virtual int PageActionCount() OVERRIDE; | 332 virtual int PageActionCount() OVERRIDE; |
| 332 virtual int PageActionVisibleCount() OVERRIDE; | 333 virtual int PageActionVisibleCount() OVERRIDE; |
| 333 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE; | 334 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE; |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 | 563 |
| 563 #if defined(USE_AURA) | 564 #if defined(USE_AURA) |
| 564 // Observer for a fade-in animation. | 565 // Observer for a fade-in animation. |
| 565 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; | 566 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; |
| 566 #endif | 567 #endif |
| 567 | 568 |
| 568 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); | 569 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); |
| 569 }; | 570 }; |
| 570 | 571 |
| 571 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 572 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |