| 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 #pragma once | 7 #pragma once | 
| 8 | 8 | 
| 9 #include <string> | 9 #include <string> | 
| 10 | 10 | 
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 211   // A decoration that shows a lock icon and ev-cert label in a bubble | 211   // A decoration that shows a lock icon and ev-cert label in a bubble | 
| 212   // on the left. | 212   // on the left. | 
| 213   scoped_ptr<EVBubbleDecoration> ev_bubble_decoration_; | 213   scoped_ptr<EVBubbleDecoration> ev_bubble_decoration_; | 
| 214 | 214 | 
| 215   // Bookmark star right of page actions. | 215   // Bookmark star right of page actions. | 
| 216   scoped_ptr<StarDecoration> star_decoration_; | 216   scoped_ptr<StarDecoration> star_decoration_; | 
| 217 | 217 | 
| 218   // Chrome To Mobile page action icon. | 218   // Chrome To Mobile page action icon. | 
| 219   scoped_ptr<ChromeToMobileDecoration> chrome_to_mobile_decoration_; | 219   scoped_ptr<ChromeToMobileDecoration> chrome_to_mobile_decoration_; | 
| 220 | 220 | 
| 221   // Any installed Page Actions. | 221   // The installed page actions. | 
|  | 222   std::vector<ExtensionAction*> page_actions_; | 
|  | 223 | 
|  | 224   // Decorations for the installed Page Actions. | 
| 222   ScopedVector<PageActionDecoration> page_action_decorations_; | 225   ScopedVector<PageActionDecoration> page_action_decorations_; | 
| 223 | 226 | 
| 224   // The content blocked decorations. | 227   // The content blocked decorations. | 
| 225   ScopedVector<ContentSettingDecoration> content_setting_decorations_; | 228   ScopedVector<ContentSettingDecoration> content_setting_decorations_; | 
| 226 | 229 | 
| 227   // Keyword hint decoration displayed on the right-hand side. | 230   // Keyword hint decoration displayed on the right-hand side. | 
| 228   scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_; | 231   scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_; | 
| 229 | 232 | 
| 230   Profile* profile_; | 233   Profile* profile_; | 
| 231 | 234 | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 242   // Used to schedule a task for the first run info bubble. | 245   // Used to schedule a task for the first run info bubble. | 
| 243   base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; | 246   base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; | 
| 244 | 247 | 
| 245   // Used to change the visibility of the star decoration. | 248   // Used to change the visibility of the star decoration. | 
| 246   BooleanPrefMember edit_bookmarks_enabled_; | 249   BooleanPrefMember edit_bookmarks_enabled_; | 
| 247 | 250 | 
| 248   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 251   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 
| 249 }; | 252 }; | 
| 250 | 253 | 
| 251 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ | 254 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ | 
| OLD | NEW | 
|---|