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

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

Issue 1718563002: Convert location bar decorations to Material Design (Mac). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md_toolbar
Patch Set: Fix issue from browser test. Created 4 years, 9 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 // is called and this function returns |NSZeroPoint|. 152 // is called and this function returns |NSZeroPoint|.
153 NSPoint GetPageActionBubblePoint(ExtensionAction* page_action); 153 NSPoint GetPageActionBubblePoint(ExtensionAction* page_action);
154 154
155 // Updates the controller, and, if |contents| is non-null, restores saved 155 // Updates the controller, and, if |contents| is non-null, restores saved
156 // state that the tab holds. 156 // state that the tab holds.
157 void Update(const content::WebContents* contents); 157 void Update(const content::WebContents* contents);
158 158
159 // Clears any location bar state stored for |contents|. 159 // Clears any location bar state stored for |contents|.
160 void ResetTabState(content::WebContents* contents); 160 void ResetTabState(content::WebContents* contents);
161 161
162 // Set the location bar's icon to the correct image for the current URL.
163 void UpdateLocationIcon();
164
165 // Notify the location bar that it was added to the browser window. Provides
166 // an update point for interface objects that need to set their appearance
167 // based on the window's theme.
168 void OnAddedToWindow();
169
162 // ChromeOmniboxEditController: 170 // ChromeOmniboxEditController:
163 void UpdateWithoutTabRestore() override; 171 void UpdateWithoutTabRestore() override;
164 void OnChanged() override; 172 void OnChanged() override;
165 void OnSetFocus() override; 173 void OnSetFocus() override;
166 void ShowURL() override; 174 void ShowURL() override;
167 ToolbarModel* GetToolbarModel() override; 175 ToolbarModel* GetToolbarModel() override;
168 const ToolbarModel* GetToolbarModel() const override; 176 const ToolbarModel* GetToolbarModel() const override;
169 content::WebContents* GetWebContents() override; 177 content::WebContents* GetWebContents() override;
170 178
179 bool ShouldShowEVBubble() const;
171 NSImage* GetKeywordImage(const base::string16& keyword); 180 NSImage* GetKeywordImage(const base::string16& keyword);
172 181
173 AutocompleteTextField* GetAutocompleteTextField() { return field_; } 182 AutocompleteTextField* GetAutocompleteTextField() { return field_; }
174 183
175 ManagePasswordsDecoration* manage_passwords_decoration() { 184 ManagePasswordsDecoration* manage_passwords_decoration() {
176 return manage_passwords_decoration_.get(); 185 return manage_passwords_decoration_.get();
177 } 186 }
178 187
179 Browser* browser() const { return browser_; } 188 Browser* browser() const { return browser_; }
180 189
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 // Indicates whether or not the location bar is currently visible. 275 // Indicates whether or not the location bar is currently visible.
267 bool location_bar_visible_; 276 bool location_bar_visible_;
268 277
269 // Used to schedule a task for the first run info bubble. 278 // Used to schedule a task for the first run info bubble.
270 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 279 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
271 280
272 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 281 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
273 }; 282 };
274 283
275 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 284 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698