| 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_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ | 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #import <Cocoa/Cocoa.h> | 10 #import <Cocoa/Cocoa.h> |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 InstantCompleteBehavior behavior) OVERRIDE; | 62 InstantCompleteBehavior behavior) OVERRIDE; |
| 63 virtual string16 GetInputString() const OVERRIDE; | 63 virtual string16 GetInputString() const OVERRIDE; |
| 64 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; | 64 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; |
| 65 virtual content::PageTransition GetPageTransition() const OVERRIDE; | 65 virtual content::PageTransition GetPageTransition() const OVERRIDE; |
| 66 virtual void AcceptInput() OVERRIDE; | 66 virtual void AcceptInput() OVERRIDE; |
| 67 virtual void FocusLocation(bool select_all) OVERRIDE; | 67 virtual void FocusLocation(bool select_all) OVERRIDE; |
| 68 virtual void FocusSearch() OVERRIDE; | 68 virtual void FocusSearch() OVERRIDE; |
| 69 virtual void UpdateContentSettingsIcons() OVERRIDE; | 69 virtual void UpdateContentSettingsIcons() OVERRIDE; |
| 70 virtual void UpdatePageActions() OVERRIDE; | 70 virtual void UpdatePageActions() OVERRIDE; |
| 71 virtual void InvalidatePageActions() OVERRIDE; | 71 virtual void InvalidatePageActions() OVERRIDE; |
| 72 virtual void UpdateWebIntentsButton() OVERRIDE; |
| 72 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; | 73 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; |
| 73 virtual void Revert() OVERRIDE; | 74 virtual void Revert() OVERRIDE; |
| 74 virtual const OmniboxView* GetLocationEntry() const OVERRIDE; | 75 virtual const OmniboxView* GetLocationEntry() const OVERRIDE; |
| 75 virtual OmniboxView* GetLocationEntry() OVERRIDE; | 76 virtual OmniboxView* GetLocationEntry() OVERRIDE; |
| 76 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; | 77 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; |
| 77 | 78 |
| 78 // Overridden from LocationBarTesting: | 79 // Overridden from LocationBarTesting: |
| 79 virtual int PageActionCount() OVERRIDE; | 80 virtual int PageActionCount() OVERRIDE; |
| 80 virtual int PageActionVisibleCount() OVERRIDE; | 81 virtual int PageActionVisibleCount() OVERRIDE; |
| 81 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE; | 82 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE; |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 // Used to schedule a task for the first run info bubble. | 254 // Used to schedule a task for the first run info bubble. |
| 254 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; | 255 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; |
| 255 | 256 |
| 256 // Used to change the visibility of the star decoration. | 257 // Used to change the visibility of the star decoration. |
| 257 BooleanPrefMember edit_bookmarks_enabled_; | 258 BooleanPrefMember edit_bookmarks_enabled_; |
| 258 | 259 |
| 259 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 260 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); |
| 260 }; | 261 }; |
| 261 | 262 |
| 262 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ | 263 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ |
| OLD | NEW |