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

Side by Side Diff: chrome_frame/cfproxy_private.h

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/worker/nativewebworker_impl.cc ('k') | chrome_frame/chrome_active_document.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_FRAME_CFPROXY_PRIVATE_H_ 5 #ifndef CHROME_FRAME_CFPROXY_PRIVATE_H_
6 #define CHROME_FRAME_CFPROXY_PRIVATE_H_ 6 #define CHROME_FRAME_CFPROXY_PRIVATE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 #include "chrome_frame/cfproxy.h" 13 #include "chrome_frame/cfproxy.h"
14 #include "base/thread.h" 14 #include "base/threading/thread.h"
15 // Since we can't forward declare IPC::Message::Sender or IPC::Channel::Listener 15 // Since we can't forward declare IPC::Message::Sender or IPC::Channel::Listener
16 #include "ipc/ipc_message.h" 16 #include "ipc/ipc_message.h"
17 #include "ipc/ipc_channel.h" 17 #include "ipc/ipc_channel.h"
18 18
19 typedef std::map<int, ChromeProxyDelegate*> TabsMap; 19 typedef std::map<int, ChromeProxyDelegate*> TabsMap;
20 20
21 // This is the functions needed by CFProxy implementation. 21 // This is the functions needed by CFProxy implementation.
22 // Extracted in separate class so we can mock it. 22 // Extracted in separate class so we can mock it.
23 class CFProxyTraits { 23 class CFProxyTraits {
24 public: 24 public:
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 }; 180 };
181 181
182 DISABLE_RUNNABLE_METHOD_REFCOUNT(CFProxy); 182 DISABLE_RUNNABLE_METHOD_REFCOUNT(CFProxy);
183 183
184 // Support functions. 184 // Support functions.
185 std::string GenerateChannelId(); 185 std::string GenerateChannelId();
186 std::wstring BuildCmdLine(const std::string& channel_id, 186 std::wstring BuildCmdLine(const std::string& channel_id,
187 const FilePath& profile_path, 187 const FilePath& profile_path,
188 const std::wstring& extra_args); 188 const std::wstring& extra_args);
189 #endif // CHROME_FRAME_CFPROXY_PRIVATE_H_ 189 #endif // CHROME_FRAME_CFPROXY_PRIVATE_H_
OLDNEW
« no previous file with comments | « chrome/worker/nativewebworker_impl.cc ('k') | chrome_frame/chrome_active_document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698