Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(850)

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Issue 540483002: Fix regression in showing bookmark star when an extension should override it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 virtual GURL GetDestinationURL() const OVERRIDE; 60 virtual GURL GetDestinationURL() const OVERRIDE;
61 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 61 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
62 virtual content::PageTransition GetPageTransition() const OVERRIDE; 62 virtual content::PageTransition GetPageTransition() const OVERRIDE;
63 virtual void AcceptInput() OVERRIDE; 63 virtual void AcceptInput() OVERRIDE;
64 virtual void FocusLocation(bool select_all) OVERRIDE; 64 virtual void FocusLocation(bool select_all) OVERRIDE;
65 virtual void FocusSearch() OVERRIDE; 65 virtual void FocusSearch() OVERRIDE;
66 virtual void UpdateContentSettingsIcons() OVERRIDE; 66 virtual void UpdateContentSettingsIcons() OVERRIDE;
67 virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE; 67 virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE;
68 virtual void UpdatePageActions() OVERRIDE; 68 virtual void UpdatePageActions() OVERRIDE;
69 virtual void InvalidatePageActions() OVERRIDE; 69 virtual void InvalidatePageActions() OVERRIDE;
70 virtual void UpdateBookmarkStarVisibility() OVERRIDE;
70 virtual bool ShowPageActionPopup(const extensions::Extension* extension, 71 virtual bool ShowPageActionPopup(const extensions::Extension* extension,
71 bool grant_active_tab) OVERRIDE; 72 bool grant_active_tab) OVERRIDE;
72 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE; 73 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE;
73 virtual void UpdateGeneratedCreditCardView() OVERRIDE; 74 virtual void UpdateGeneratedCreditCardView() OVERRIDE;
74 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; 75 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE;
75 virtual void Revert() OVERRIDE; 76 virtual void Revert() OVERRIDE;
76 virtual const OmniboxView* GetOmniboxView() const OVERRIDE; 77 virtual const OmniboxView* GetOmniboxView() const OVERRIDE;
77 virtual OmniboxView* GetOmniboxView() OVERRIDE; 78 virtual OmniboxView* GetOmniboxView() OVERRIDE;
78 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; 79 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
79 80
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 void ShowFirstRunBubbleInternal(); 207 void ShowFirstRunBubbleInternal();
207 208
208 // Updates the translate decoration in the omnibox with the current translate 209 // Updates the translate decoration in the omnibox with the current translate
209 // state. 210 // state.
210 void UpdateTranslateDecoration(); 211 void UpdateTranslateDecoration();
211 212
212 // Updates the zoom decoration in the omnibox with the current zoom level. 213 // Updates the zoom decoration in the omnibox with the current zoom level.
213 // Returns whether any updates were made. 214 // Returns whether any updates were made.
214 bool UpdateZoomDecoration(); 215 bool UpdateZoomDecoration();
215 216
216 // Ensures the star decoration is visible or hidden, as required.
217 void UpdateStarDecorationVisibility();
218
219 // Updates the voice search decoration. Returns true if the visible state was 217 // Updates the voice search decoration. Returns true if the visible state was
220 // changed. 218 // changed.
221 bool UpdateMicSearchDecorationVisibility(); 219 bool UpdateMicSearchDecorationVisibility();
222 220
223 scoped_ptr<OmniboxViewMac> omnibox_view_; 221 scoped_ptr<OmniboxViewMac> omnibox_view_;
224 222
225 AutocompleteTextField* field_; // owned by tab controller 223 AutocompleteTextField* field_; // owned by tab controller
226 224
227 // A decoration that shows an icon to the left of the address. 225 // A decoration that shows an icon to the left of the address.
228 scoped_ptr<LocationIconDecoration> location_icon_decoration_; 226 scoped_ptr<LocationIconDecoration> location_icon_decoration_;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 // Used to schedule a task for the first run info bubble. 274 // Used to schedule a task for the first run info bubble.
277 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 275 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
278 276
279 // Used to change the visibility of the star decoration. 277 // Used to change the visibility of the star decoration.
280 BooleanPrefMember edit_bookmarks_enabled_; 278 BooleanPrefMember edit_bookmarks_enabled_;
281 279
282 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 280 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
283 }; 281 };
284 282
285 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 283 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/location_bar_controller.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698