| 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 20 matching lines...) Expand all  Loading... | 
| 31 class LocationIconDecoration; | 31 class LocationIconDecoration; | 
| 32 class PageActionDecoration; | 32 class PageActionDecoration; | 
| 33 class PlusDecoration; | 33 class PlusDecoration; | 
| 34 class Profile; | 34 class Profile; | 
| 35 class SearchTokenDecoration; | 35 class SearchTokenDecoration; | 
| 36 class SelectedKeywordDecoration; | 36 class SelectedKeywordDecoration; | 
| 37 class SeparatorDecoration; | 37 class SeparatorDecoration; | 
| 38 class StarDecoration; | 38 class StarDecoration; | 
| 39 class ToolbarModel; | 39 class ToolbarModel; | 
| 40 class ZoomDecoration; | 40 class ZoomDecoration; | 
|  | 41 class ZoomDecorationTest; | 
| 41 | 42 | 
| 42 // A C++ bridge class that represents the location bar UI element to | 43 // A C++ bridge class that represents the location bar UI element to | 
| 43 // the portable code.  Wires up an OmniboxViewMac instance to | 44 // the portable code.  Wires up an OmniboxViewMac instance to | 
| 44 // the location bar text field, which handles most of the work. | 45 // the location bar text field, which handles most of the work. | 
| 45 | 46 | 
| 46 class LocationBarViewMac : public LocationBar, | 47 class LocationBarViewMac : public LocationBar, | 
| 47                            public LocationBarTesting, | 48                            public LocationBarTesting, | 
| 48                            public OmniboxEditController, | 49                            public OmniboxEditController, | 
| 49                            public content::NotificationObserver { | 50                            public content::NotificationObserver { | 
| 50  public: | 51  public: | 
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 172 | 173 | 
| 173   AutocompleteTextField* GetAutocompleteTextField() { return field_; } | 174   AutocompleteTextField* GetAutocompleteTextField() { return field_; } | 
| 174 | 175 | 
| 175 | 176 | 
| 176   // content::NotificationObserver: | 177   // content::NotificationObserver: | 
| 177   virtual void Observe(int type, | 178   virtual void Observe(int type, | 
| 178                        const content::NotificationSource& source, | 179                        const content::NotificationSource& source, | 
| 179                        const content::NotificationDetails& details) OVERRIDE; | 180                        const content::NotificationDetails& details) OVERRIDE; | 
| 180 | 181 | 
| 181   Browser* browser() const { return browser_; } | 182   Browser* browser() const { return browser_; } | 
|  | 183   ToolbarModel* toolbar_model() const { return toolbar_model_; } | 
| 182 | 184 | 
| 183  private: | 185  private: | 
| 184   friend LocationBarViewMacBrowserTest; | 186   friend LocationBarViewMacBrowserTest; | 
|  | 187   friend ZoomDecorationTest; | 
| 185 | 188 | 
| 186   // Posts |notification| to the default notification center. | 189   // Posts |notification| to the default notification center. | 
| 187   void PostNotification(NSString* notification); | 190   void PostNotification(NSString* notification); | 
| 188 | 191 | 
| 189   // Return the decoration for |page_action|. | 192   // Return the decoration for |page_action|. | 
| 190   PageActionDecoration* GetPageActionDecoration(ExtensionAction* page_action); | 193   PageActionDecoration* GetPageActionDecoration(ExtensionAction* page_action); | 
| 191 | 194 | 
| 192   // Clear the page-action decorations. | 195   // Clear the page-action decorations. | 
| 193   void DeletePageActionDecorations(); | 196   void DeletePageActionDecorations(); | 
| 194 | 197 | 
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 286   // Used to schedule a task for the first run info bubble. | 289   // Used to schedule a task for the first run info bubble. | 
| 287   base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; | 290   base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; | 
| 288 | 291 | 
| 289   // Used to change the visibility of the star decoration. | 292   // Used to change the visibility of the star decoration. | 
| 290   BooleanPrefMember edit_bookmarks_enabled_; | 293   BooleanPrefMember edit_bookmarks_enabled_; | 
| 291 | 294 | 
| 292   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 295   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 
| 293 }; | 296 }; | 
| 294 | 297 | 
| 295 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ | 298 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ | 
| OLD | NEW | 
|---|