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

Side by Side Diff: android_webview/lib/main/aw_main_delegate.h

Issue 1852513003: Convert //android_webview to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git is hard 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 (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 ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_ 5 #ifndef ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
6 #define ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_ 6 #define ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
7 7
8 #include <memory>
9
8 #include "android_webview/browser/jni_dependency_factory.h" 10 #include "android_webview/browser/jni_dependency_factory.h"
9 #include "android_webview/common/aw_content_client.h" 11 #include "android_webview/common/aw_content_client.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "content/public/app/content_main_delegate.h" 14 #include "content/public/app/content_main_delegate.h"
14 15
15 namespace content { 16 namespace content {
16 class BrowserMainRunner; 17 class BrowserMainRunner;
17 } 18 }
18 19
19 namespace android_webview { 20 namespace android_webview {
20 21
21 class AwContentBrowserClient; 22 class AwContentBrowserClient;
22 class AwContentRendererClient; 23 class AwContentRendererClient;
(...skipping 22 matching lines...) Expand all
45 content::WebContentsViewDelegate* CreateViewDelegate( 46 content::WebContentsViewDelegate* CreateViewDelegate(
46 content::WebContents* web_contents) override; 47 content::WebContents* web_contents) override;
47 AwWebPreferencesPopulater* CreateWebPreferencesPopulater() override; 48 AwWebPreferencesPopulater* CreateWebPreferencesPopulater() override;
48 AwMessagePortService* CreateAwMessagePortService() override; 49 AwMessagePortService* CreateAwMessagePortService() override;
49 AwLocaleManager* CreateAwLocaleManager() override; 50 AwLocaleManager* CreateAwLocaleManager() override;
50 #if defined(VIDEO_HOLE) 51 #if defined(VIDEO_HOLE)
51 content::ExternalVideoSurfaceContainer* CreateExternalVideoSurfaceContainer( 52 content::ExternalVideoSurfaceContainer* CreateExternalVideoSurfaceContainer(
52 content::WebContents* web_contents) override; 53 content::WebContents* web_contents) override;
53 #endif 54 #endif
54 55
55 scoped_ptr<content::BrowserMainRunner> browser_runner_; 56 std::unique_ptr<content::BrowserMainRunner> browser_runner_;
56 AwContentClient content_client_; 57 AwContentClient content_client_;
57 scoped_ptr<AwContentBrowserClient> content_browser_client_; 58 std::unique_ptr<AwContentBrowserClient> content_browser_client_;
58 scoped_ptr<AwContentRendererClient> content_renderer_client_; 59 std::unique_ptr<AwContentRendererClient> content_renderer_client_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(AwMainDelegate); 61 DISALLOW_COPY_AND_ASSIGN(AwMainDelegate);
61 }; 62 };
62 63
63 } // namespace android_webview 64 } // namespace android_webview
64 65
65 #endif // ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_ 66 #endif // ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « android_webview/lib/aw_browser_dependency_factory_impl.h ('k') | android_webview/lib/main/aw_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698