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

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

Issue 302453002: New animation for the origin chip URL showing/hiding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test failure by checking for NULL extension Created 6 years, 6 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 | Annotate | Revision Log
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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // This function should always be called with a visible page action. 144 // This function should always be called with a visible page action.
145 // If |page_action| is not a page action or not visible, NOTREACHED() 145 // If |page_action| is not a page action or not visible, NOTREACHED()
146 // is called and this function returns |NSZeroPoint|. 146 // is called and this function returns |NSZeroPoint|.
147 NSPoint GetPageActionBubblePoint(ExtensionAction* page_action); 147 NSPoint GetPageActionBubblePoint(ExtensionAction* page_action);
148 148
149 // OmniboxEditController: 149 // OmniboxEditController:
150 virtual void Update(const content::WebContents* contents) OVERRIDE; 150 virtual void Update(const content::WebContents* contents) OVERRIDE;
151 virtual void OnChanged() OVERRIDE; 151 virtual void OnChanged() OVERRIDE;
152 virtual void OnSetFocus() OVERRIDE; 152 virtual void OnSetFocus() OVERRIDE;
153 virtual void ShowURL() OVERRIDE; 153 virtual void ShowURL() OVERRIDE;
154 virtual void EndOriginChipAnimations(bool cancel_fade) OVERRIDE;
154 virtual InstantController* GetInstant() OVERRIDE; 155 virtual InstantController* GetInstant() OVERRIDE;
155 virtual content::WebContents* GetWebContents() OVERRIDE; 156 virtual content::WebContents* GetWebContents() OVERRIDE;
156 virtual ToolbarModel* GetToolbarModel() OVERRIDE; 157 virtual ToolbarModel* GetToolbarModel() OVERRIDE;
157 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE; 158 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE;
158 159
159 NSImage* GetKeywordImage(const base::string16& keyword); 160 NSImage* GetKeywordImage(const base::string16& keyword);
160 161
161 AutocompleteTextField* GetAutocompleteTextField() { return field_; } 162 AutocompleteTextField* GetAutocompleteTextField() { return field_; }
162 163
163 164
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 // Used to schedule a task for the first run info bubble. 274 // Used to schedule a task for the first run info bubble.
274 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 275 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
275 276
276 // Used to change the visibility of the star decoration. 277 // Used to change the visibility of the star decoration.
277 BooleanPrefMember edit_bookmarks_enabled_; 278 BooleanPrefMember edit_bookmarks_enabled_;
278 279
279 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 280 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
280 }; 281 };
281 282
282 #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

Powered by Google App Engine
This is Rietveld 408576698