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

Side by Side Diff: android_webview/lib/aw_browser_dependency_factory_impl.h

Issue 10983004: Fix warnings when compiling with clang (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Sync try Created 8 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 | « no previous file | android_webview/lib/aw_browser_dependency_factory_impl.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 ANDROID_WEBVIEW_LIB_BROWSER_DELEGATE_IMPL_H_ 5 #ifndef ANDROID_WEBVIEW_LIB_BROWSER_DELEGATE_IMPL_H_
6 #define ANDROID_WEBVIEW_LIB_BROWSER_DELEGATE_IMPL_H_ 6 #define ANDROID_WEBVIEW_LIB_BROWSER_DELEGATE_IMPL_H_
7 7
8 #include "android_webview/native/aw_browser_dependency_factory.h" 8 #include "android_webview/native/aw_browser_dependency_factory.h"
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 13 matching lines...) Expand all
24 virtual ~AwBrowserDependencyFactoryImpl(); 24 virtual ~AwBrowserDependencyFactoryImpl();
25 25
26 // Sets this class as the singleton instance. 26 // Sets this class as the singleton instance.
27 static void InstallInstance(); 27 static void InstallInstance();
28 28
29 // AwBrowserDependencyFactory 29 // AwBrowserDependencyFactory
30 virtual content::BrowserContext* GetBrowserContext(bool incognito) OVERRIDE; 30 virtual content::BrowserContext* GetBrowserContext(bool incognito) OVERRIDE;
31 virtual content::WebContents* CreateWebContents(bool incognito) OVERRIDE; 31 virtual content::WebContents* CreateWebContents(bool incognito) OVERRIDE;
32 virtual AwContentsContainer* CreateContentsContainer( 32 virtual AwContentsContainer* CreateContentsContainer(
33 content::WebContents* contents) OVERRIDE; 33 content::WebContents* contents) OVERRIDE;
34 virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator()
35 OVERRIDE;
36 34
37 private: 35 private:
38 void InitializeNetworkDelegateOnIOThread( 36 void InitializeNetworkDelegateOnIOThread(
39 net::URLRequestContextGetter* normal_context, 37 net::URLRequestContextGetter* normal_context,
40 net::URLRequestContextGetter* incognito_context); 38 net::URLRequestContextGetter* incognito_context);
41 void EnsureNetworkDelegateInitialized(); 39 void EnsureNetworkDelegateInitialized();
42 40
43 // Constructed and assigned on the IO thread. 41 // Constructed and assigned on the IO thread.
44 scoped_ptr<AwNetworkDelegate> network_delegate_; 42 scoped_ptr<AwNetworkDelegate> network_delegate_;
45 // Set on the UI thread. 43 // Set on the UI thread.
46 bool initialized_network_delegate_; 44 bool initialized_network_delegate_;
47 45
48 DISALLOW_COPY_AND_ASSIGN(AwBrowserDependencyFactoryImpl); 46 DISALLOW_COPY_AND_ASSIGN(AwBrowserDependencyFactoryImpl);
49 }; 47 };
50 48
51 } // namespace android_webview 49 } // namespace android_webview
52 50
53 #endif // ANDROID_WEBVIEW_LIB_BROWSER_DELEGATE_IMPL_H_ 51 #endif // ANDROID_WEBVIEW_LIB_BROWSER_DELEGATE_IMPL_H_
54
OLDNEW
« no previous file with comments | « no previous file | android_webview/lib/aw_browser_dependency_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698