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

Side by Side Diff: ios/web/web_state/web_state_impl.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_ 5 #ifndef IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_
6 #define IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_ 6 #define IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <map> 11 #include <map>
12 #include <memory>
12 #include <string> 13 #include <string>
13 #include <vector> 14 #include <vector>
14 15
15 #include "base/macros.h" 16 #include "base/macros.h"
16 #include "base/memory/ref_counted.h" 17 #include "base/memory/ref_counted.h"
17 #include "base/memory/scoped_ptr.h"
18 #include "base/observer_list.h" 18 #include "base/observer_list.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "ios/web/navigation/navigation_manager_delegate.h" 20 #include "ios/web/navigation/navigation_manager_delegate.h"
21 #include "ios/web/navigation/navigation_manager_impl.h" 21 #include "ios/web/navigation/navigation_manager_impl.h"
22 #include "ios/web/net/request_tracker_impl.h" 22 #include "ios/web/net/request_tracker_impl.h"
23 #include "ios/web/public/web_state/web_state.h" 23 #include "ios/web/public/web_state/web_state.h"
24 #include "url/gurl.h" 24 #include "url/gurl.h"
25 25
26 @protocol CRWRequestTrackerDelegate; 26 @protocol CRWRequestTrackerDelegate;
27 @class CRWWebController; 27 @class CRWWebController;
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 // The delegate used to pass state to the web contents facade. 288 // The delegate used to pass state to the web contents facade.
289 WebStateFacadeDelegate* facade_delegate_; 289 WebStateFacadeDelegate* facade_delegate_;
290 290
291 // The CRWWebController that backs and owns this object. 291 // The CRWWebController that backs and owns this object.
292 CRWWebController* web_controller_; 292 CRWWebController* web_controller_;
293 293
294 NavigationManagerImpl navigation_manager_; 294 NavigationManagerImpl navigation_manager_;
295 295
296 // |web::WebUIIOS| object for the current page if it is a WebUI page that 296 // |web::WebUIIOS| object for the current page if it is a WebUI page that
297 // uses the web-based WebUI framework, or nullptr otherwise. 297 // uses the web-based WebUI framework, or nullptr otherwise.
298 scoped_ptr<web::WebUIIOS> web_ui_; 298 std::unique_ptr<web::WebUIIOS> web_ui_;
299 299
300 // A list of observers notified when page state changes. Weak references. 300 // A list of observers notified when page state changes. Weak references.
301 base::ObserverList<WebStateObserver, true> observers_; 301 base::ObserverList<WebStateObserver, true> observers_;
302 302
303 // All the WebStatePolicyDeciders asked for navigation decision. Weak 303 // All the WebStatePolicyDeciders asked for navigation decision. Weak
304 // references. 304 // references.
305 // WebStatePolicyDeciders are semantically different from observers (they 305 // WebStatePolicyDeciders are semantically different from observers (they
306 // modify the behavior of the WebState) but are used like observers in the 306 // modify the behavior of the WebState) but are used like observers in the
307 // code, hence the ObserverList. 307 // code, hence the ObserverList.
308 base::ObserverList<WebStatePolicyDecider, true> policy_deciders_; 308 base::ObserverList<WebStatePolicyDecider, true> policy_deciders_;
(...skipping 28 matching lines...) Expand all
337 // any WeakPtrs to WebStateImpl are invalidated before its member variable's 337 // any WeakPtrs to WebStateImpl are invalidated before its member variable's
338 // destructors are executed, rendering them invalid. 338 // destructors are executed, rendering them invalid.
339 base::WeakPtrFactory<WebState> weak_factory_; 339 base::WeakPtrFactory<WebState> weak_factory_;
340 340
341 DISALLOW_COPY_AND_ASSIGN(WebStateImpl); 341 DISALLOW_COPY_AND_ASSIGN(WebStateImpl);
342 }; 342 };
343 343
344 } // namespace web 344 } // namespace web
345 345
346 #endif // IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_ 346 #endif // IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_
OLDNEW
« no previous file with comments | « ios/web/web_state/ui/wk_web_view_configuration_provider_unittest.mm ('k') | ios/web/web_state/web_state_impl_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698