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

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

Issue 658943002: Revert of [src/chrome/browser/] Declaring the weak_ptr_factory in proper order in ui and prerender … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 scoped_ptr<SearchButtonDecoration> search_button_decoration_; 264 scoped_ptr<SearchButtonDecoration> search_button_decoration_;
265 265
266 // The left-hand-side origin chip. 266 // The left-hand-side origin chip.
267 scoped_ptr<OriginChipDecoration> origin_chip_decoration_; 267 scoped_ptr<OriginChipDecoration> origin_chip_decoration_;
268 268
269 // The right-hand-side button to manage passwords associated with a page. 269 // The right-hand-side button to manage passwords associated with a page.
270 scoped_ptr<ManagePasswordsDecoration> manage_passwords_decoration_; 270 scoped_ptr<ManagePasswordsDecoration> manage_passwords_decoration_;
271 271
272 Browser* browser_; 272 Browser* browser_;
273 273
274 // Used to schedule a task for the first run info bubble.
275 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
276
274 // Used to change the visibility of the star decoration. 277 // Used to change the visibility of the star decoration.
275 BooleanPrefMember edit_bookmarks_enabled_; 278 BooleanPrefMember edit_bookmarks_enabled_;
276 279
277 // Used to schedule a task for the first run info bubble.
278 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
279
280 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 280 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
281 }; 281 };
282 282
283 #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/ui/browser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698