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

Side by Side Diff: chrome/browser/ui/browser.h

Issue 572853002: Realigning the WeakPtrFactory initialization order in chrome/ui folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed mac error 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
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/browser.cc » ('j') | 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 scoped_ptr<extensions::WindowController> extension_window_controller_; 943 scoped_ptr<extensions::WindowController> extension_window_controller_;
944 944
945 scoped_ptr<chrome::BrowserCommandController> command_controller_; 945 scoped_ptr<chrome::BrowserCommandController> command_controller_;
946 946
947 // True if the browser window has been shown at least once. 947 // True if the browser window has been shown at least once.
948 bool window_has_shown_; 948 bool window_has_shown_;
949 949
950 // The following factory is used for chrome update coalescing. 950 // The following factory is used for chrome update coalescing.
951 base::WeakPtrFactory<Browser> chrome_updater_factory_; 951 base::WeakPtrFactory<Browser> chrome_updater_factory_;
952 952
953 // The following factory is used to close the frame at a later time.
954 base::WeakPtrFactory<Browser> weak_factory_;
955
956 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; 953 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_;
957 954
958 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; 955 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_;
959 956
957 // The following factory is used to close the frame at a later time.
958 base::WeakPtrFactory<Browser> weak_factory_;
959
960 DISALLOW_COPY_AND_ASSIGN(Browser); 960 DISALLOW_COPY_AND_ASSIGN(Browser);
961 }; 961 };
962 962
963 #endif // CHROME_BROWSER_UI_BROWSER_H_ 963 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698