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

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

Issue 505123002: Revert "Revert of Hook up the Mac password bubble to the browser and add browser tests. (patchset #… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix include for real this time 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 virtual void EndOriginChipAnimations(bool cancel_fade) OVERRIDE; 160 virtual void EndOriginChipAnimations(bool cancel_fade) OVERRIDE;
161 virtual InstantController* GetInstant() OVERRIDE; 161 virtual InstantController* GetInstant() OVERRIDE;
162 virtual content::WebContents* GetWebContents() OVERRIDE; 162 virtual content::WebContents* GetWebContents() OVERRIDE;
163 virtual ToolbarModel* GetToolbarModel() OVERRIDE; 163 virtual ToolbarModel* GetToolbarModel() OVERRIDE;
164 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE; 164 virtual const ToolbarModel* GetToolbarModel() const OVERRIDE;
165 165
166 NSImage* GetKeywordImage(const base::string16& keyword); 166 NSImage* GetKeywordImage(const base::string16& keyword);
167 167
168 AutocompleteTextField* GetAutocompleteTextField() { return field_; } 168 AutocompleteTextField* GetAutocompleteTextField() { return field_; }
169 169
170 ManagePasswordsDecoration* manage_passwords_decoration() {
171 return manage_passwords_decoration_.get();
172 }
173
170 // SearchModelObserver: 174 // SearchModelObserver:
171 virtual void ModelChanged(const SearchModel::State& old_state, 175 virtual void ModelChanged(const SearchModel::State& old_state,
172 const SearchModel::State& new_state) OVERRIDE; 176 const SearchModel::State& new_state) OVERRIDE;
173 177
174 Browser* browser() const { return browser_; } 178 Browser* browser() const { return browser_; }
175 179
176 protected: 180 protected:
177 // OmniboxEditController: 181 // OmniboxEditController:
178 virtual void HideURL() OVERRIDE; 182 virtual void HideURL() OVERRIDE;
179 183
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // Used to schedule a task for the first run info bubble. 276 // Used to schedule a task for the first run info bubble.
273 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 277 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
274 278
275 // Used to change the visibility of the star decoration. 279 // Used to change the visibility of the star decoration.
276 BooleanPrefMember edit_bookmarks_enabled_; 280 BooleanPrefMember edit_bookmarks_enabled_;
277 281
278 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 282 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
279 }; 283 };
280 284
281 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 285 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_dialogs.h ('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