| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 void ShowFirstRunBubble() override; | 59 void ShowFirstRunBubble() override; |
| 60 GURL GetDestinationURL() const override; | 60 GURL GetDestinationURL() const override; |
| 61 WindowOpenDisposition GetWindowOpenDisposition() const override; | 61 WindowOpenDisposition GetWindowOpenDisposition() const override; |
| 62 ui::PageTransition GetPageTransition() const override; | 62 ui::PageTransition GetPageTransition() const override; |
| 63 void AcceptInput() override; | 63 void AcceptInput() override; |
| 64 void FocusLocation(bool select_all) override; | 64 void FocusLocation(bool select_all) override; |
| 65 void FocusSearch() override; | 65 void FocusSearch() override; |
| 66 void UpdateContentSettingsIcons() override; | 66 void UpdateContentSettingsIcons() override; |
| 67 void UpdateManagePasswordsIconAndBubble() override; | 67 void UpdateManagePasswordsIconAndBubble() override; |
| 68 void UpdatePageActions() override; | 68 void UpdatePageActions() override; |
| 69 void InvalidatePageActions() override; | |
| 70 void UpdateBookmarkStarVisibility() override; | 69 void UpdateBookmarkStarVisibility() override; |
| 71 bool ShowPageActionPopup(const extensions::Extension* extension, | 70 bool ShowPageActionPopup(const extensions::Extension* extension, |
| 72 bool grant_active_tab) override; | 71 bool grant_active_tab) override; |
| 73 void UpdateOpenPDFInReaderPrompt() override; | 72 void UpdateOpenPDFInReaderPrompt() override; |
| 74 void UpdateGeneratedCreditCardView() override; | 73 void UpdateGeneratedCreditCardView() override; |
| 75 void SaveStateToContents(content::WebContents* contents) override; | 74 void SaveStateToContents(content::WebContents* contents) override; |
| 76 void Revert() override; | 75 void Revert() override; |
| 77 const OmniboxView* GetOmniboxView() const override; | 76 const OmniboxView* GetOmniboxView() const override; |
| 78 OmniboxView* GetOmniboxView() override; | 77 OmniboxView* GetOmniboxView() override; |
| 79 LocationBarTesting* GetLocationBarForTesting() override; | 78 LocationBarTesting* GetLocationBarForTesting() override; |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 | 195 |
| 197 // Clear the page-action decorations. | 196 // Clear the page-action decorations. |
| 198 void DeletePageActionDecorations(); | 197 void DeletePageActionDecorations(); |
| 199 | 198 |
| 200 void OnEditBookmarksEnabledChanged(); | 199 void OnEditBookmarksEnabledChanged(); |
| 201 | 200 |
| 202 // Re-generate the page-action decorations from the profile's | 201 // Re-generate the page-action decorations from the profile's |
| 203 // extension service. | 202 // extension service. |
| 204 void RefreshPageActionDecorations(); | 203 void RefreshPageActionDecorations(); |
| 205 | 204 |
| 205 // Whether the page actions represented by |page_action_decorations_| differ |
| 206 // in ordering or value from |page_actions|. |
| 207 bool PageActionsDiffer( |
| 208 const std::vector<ExtensionAction*>& page_actions) const; |
| 209 |
| 206 // Updates visibility of the content settings icons based on the current | 210 // Updates visibility of the content settings icons based on the current |
| 207 // tab contents state. | 211 // tab contents state. |
| 208 bool RefreshContentSettingsDecorations(); | 212 bool RefreshContentSettingsDecorations(); |
| 209 | 213 |
| 210 void ShowFirstRunBubbleInternal(); | 214 void ShowFirstRunBubbleInternal(); |
| 211 | 215 |
| 212 // Updates the translate decoration in the omnibox with the current translate | 216 // Updates the translate decoration in the omnibox with the current translate |
| 213 // state. | 217 // state. |
| 214 void UpdateTranslateDecoration(); | 218 void UpdateTranslateDecoration(); |
| 215 | 219 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 238 // Bookmark star right of page actions. | 242 // Bookmark star right of page actions. |
| 239 scoped_ptr<StarDecoration> star_decoration_; | 243 scoped_ptr<StarDecoration> star_decoration_; |
| 240 | 244 |
| 241 // Translate icon at the end of the ominibox. | 245 // Translate icon at the end of the ominibox. |
| 242 scoped_ptr<TranslateDecoration> translate_decoration_; | 246 scoped_ptr<TranslateDecoration> translate_decoration_; |
| 243 | 247 |
| 244 // A zoom icon at the end of the omnibox, which shows at non-standard zoom | 248 // A zoom icon at the end of the omnibox, which shows at non-standard zoom |
| 245 // levels. | 249 // levels. |
| 246 scoped_ptr<ZoomDecoration> zoom_decoration_; | 250 scoped_ptr<ZoomDecoration> zoom_decoration_; |
| 247 | 251 |
| 248 // The installed page actions. | |
| 249 std::vector<ExtensionAction*> page_actions_; | |
| 250 | |
| 251 // Decorations for the installed Page Actions. | 252 // Decorations for the installed Page Actions. |
| 252 ScopedVector<PageActionDecoration> page_action_decorations_; | 253 ScopedVector<PageActionDecoration> page_action_decorations_; |
| 253 | 254 |
| 254 // The content blocked decorations. | 255 // The content blocked decorations. |
| 255 ScopedVector<ContentSettingDecoration> content_setting_decorations_; | 256 ScopedVector<ContentSettingDecoration> content_setting_decorations_; |
| 256 | 257 |
| 257 // Keyword hint decoration displayed on the right-hand side. | 258 // Keyword hint decoration displayed on the right-hand side. |
| 258 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_; | 259 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_; |
| 259 | 260 |
| 260 // The voice search icon. | 261 // The voice search icon. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 277 // Used to schedule a task for the first run info bubble. | 278 // Used to schedule a task for the first run info bubble. |
| 278 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; | 279 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; |
| 279 | 280 |
| 280 // Used to change the visibility of the star decoration. | 281 // Used to change the visibility of the star decoration. |
| 281 BooleanPrefMember edit_bookmarks_enabled_; | 282 BooleanPrefMember edit_bookmarks_enabled_; |
| 282 | 283 |
| 283 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); | 284 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); |
| 284 }; | 285 }; |
| 285 | 286 |
| 286 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ | 287 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ |
| OLD | NEW |