| OLD | NEW |
| 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_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ | 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 public: | 47 public: |
| 48 LocationBarViewMac(AutocompleteTextField* field, | 48 LocationBarViewMac(AutocompleteTextField* field, |
| 49 CommandUpdater* command_updater, | 49 CommandUpdater* command_updater, |
| 50 ToolbarModel* toolbar_model, | 50 ToolbarModel* toolbar_model, |
| 51 Profile* profile, | 51 Profile* profile, |
| 52 Browser* browser); | 52 Browser* browser); |
| 53 virtual ~LocationBarViewMac(); | 53 virtual ~LocationBarViewMac(); |
| 54 | 54 |
| 55 // Overridden from LocationBar: | 55 // Overridden from LocationBar: |
| 56 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type); | 56 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type); |
| 57 virtual void SetSuggestedText(const string16& text); | 57 virtual void SetSuggestedText(const string16& text, |
| 58 InstantCompleteBehavior behavior); |
| 58 virtual std::wstring GetInputString() const; | 59 virtual std::wstring GetInputString() const; |
| 59 virtual WindowOpenDisposition GetWindowOpenDisposition() const; | 60 virtual WindowOpenDisposition GetWindowOpenDisposition() const; |
| 60 virtual PageTransition::Type GetPageTransition() const; | 61 virtual PageTransition::Type GetPageTransition() const; |
| 61 virtual void AcceptInput(); | 62 virtual void AcceptInput(); |
| 62 virtual void FocusLocation(bool select_all); | 63 virtual void FocusLocation(bool select_all); |
| 63 virtual void FocusSearch(); | 64 virtual void FocusSearch(); |
| 64 virtual void UpdateContentSettingsIcons(); | 65 virtual void UpdateContentSettingsIcons(); |
| 65 virtual void UpdatePageActions(); | 66 virtual void UpdatePageActions(); |
| 66 virtual void InvalidatePageActions(); | 67 virtual void InvalidatePageActions(); |
| 67 virtual void SaveStateToContents(TabContents* contents); | 68 virtual void SaveStateToContents(TabContents* contents); |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 // Used to register for notifications received by NotificationObserver. | 218 // Used to register for notifications received by NotificationObserver. |
| 218 NotificationRegistrar registrar_; | 219 NotificationRegistrar registrar_; |
| 219 | 220 |
| 220 // Used to schedule a task for the first run info bubble. | 221 // Used to schedule a task for the first run info bubble. |
| 221 ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_; | 222 ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_; |
| 222 | 223 |
| 223 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 224 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); |
| 224 }; | 225 }; |
| 225 | 226 |
| 226 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ | 227 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ |
| OLD | NEW |