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

Side by Side Diff: content/browser/renderer_host/pepper/pepper_network_proxy_host.h

Issue 616603004: Replacing the OVERRIDE with override and FINAL with final in content/browser/renderer_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_NETWORK_PROXY_HOST_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_NETWORK_PROXY_HOST_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_NETWORK_PROXY_HOST_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_NETWORK_PROXY_HOST_H_
7 7
8 #include <queue> 8 #include <queue>
9 #include <string> 9 #include <string>
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 scoped_refptr<net::URLRequestContextGetter> context_getter; 50 scoped_refptr<net::URLRequestContextGetter> context_getter;
51 }; 51 };
52 static UIThreadData GetUIThreadDataOnUIThread(int render_process_id, 52 static UIThreadData GetUIThreadDataOnUIThread(int render_process_id,
53 int render_frame_id, 53 int render_frame_id,
54 bool is_external_plugin); 54 bool is_external_plugin);
55 void DidGetUIThreadData(const UIThreadData&); 55 void DidGetUIThreadData(const UIThreadData&);
56 56
57 // ResourceHost implementation. 57 // ResourceHost implementation.
58 virtual int32_t OnResourceMessageReceived( 58 virtual int32_t OnResourceMessageReceived(
59 const IPC::Message& msg, 59 const IPC::Message& msg,
60 ppapi::host::HostMessageContext* context) OVERRIDE; 60 ppapi::host::HostMessageContext* context) override;
61 61
62 int32_t OnMsgGetProxyForURL(ppapi::host::HostMessageContext* context, 62 int32_t OnMsgGetProxyForURL(ppapi::host::HostMessageContext* context,
63 const std::string& url); 63 const std::string& url);
64 64
65 // If we have a valid proxy_service_, send all messages in unsent_requests_. 65 // If we have a valid proxy_service_, send all messages in unsent_requests_.
66 void TryToSendUnsentRequests(); 66 void TryToSendUnsentRequests();
67 67
68 void OnResolveProxyCompleted(ppapi::host::ReplyMessageContext context, 68 void OnResolveProxyCompleted(ppapi::host::ReplyMessageContext context,
69 net::ProxyInfo* proxy_info, 69 net::ProxyInfo* proxy_info,
70 int result); 70 int result);
(...skipping 24 matching lines...) Expand all
95 std::queue<net::ProxyService::PacRequest*> pending_requests_; 95 std::queue<net::ProxyService::PacRequest*> pending_requests_;
96 96
97 base::WeakPtrFactory<PepperNetworkProxyHost> weak_factory_; 97 base::WeakPtrFactory<PepperNetworkProxyHost> weak_factory_;
98 98
99 DISALLOW_COPY_AND_ASSIGN(PepperNetworkProxyHost); 99 DISALLOW_COPY_AND_ASSIGN(PepperNetworkProxyHost);
100 }; 100 };
101 101
102 } // namespace content 102 } // namespace content
103 103
104 #endif // CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_NETWORK_PROXY_HOST_H_ 104 #endif // CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_NETWORK_PROXY_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698