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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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
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 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 using base::FileDescriptor; 254 using base::FileDescriptor;
255 using blink::WebWindowFeatures; 255 using blink::WebWindowFeatures;
256 using content::AccessTokenStore; 256 using content::AccessTokenStore;
257 using content::BrowserChildProcessHostIterator; 257 using content::BrowserChildProcessHostIterator;
258 using content::BrowserThread; 258 using content::BrowserThread;
259 using content::BrowserURLHandler; 259 using content::BrowserURLHandler;
260 using content::ChildProcessSecurityPolicy; 260 using content::ChildProcessSecurityPolicy;
261 using content::QuotaPermissionContext; 261 using content::QuotaPermissionContext;
262 using content::RenderFrameHost; 262 using content::RenderFrameHost;
263 using content::RenderViewHost; 263 using content::RenderViewHost;
264 using content::ResourceType;
264 using content::SiteInstance; 265 using content::SiteInstance;
265 using content::WebContents; 266 using content::WebContents;
266 using extensions::APIPermission; 267 using extensions::APIPermission;
267 using extensions::Extension; 268 using extensions::Extension;
268 using extensions::InfoMap; 269 using extensions::InfoMap;
269 using extensions::Manifest; 270 using extensions::Manifest;
270 using message_center::NotifierId; 271 using message_center::NotifierId;
271 272
272 #if defined(OS_POSIX) 273 #if defined(OS_POSIX)
273 using content::FileDescriptorInfo; 274 using content::FileDescriptorInfo;
(...skipping 2526 matching lines...) Expand 10 before | Expand all | Expand 10 after
2800 switches::kDisableWebRtcEncryption, 2801 switches::kDisableWebRtcEncryption,
2801 }; 2802 };
2802 to_command_line->CopySwitchesFrom(from_command_line, 2803 to_command_line->CopySwitchesFrom(from_command_line,
2803 kWebRtcDevSwitchNames, 2804 kWebRtcDevSwitchNames,
2804 arraysize(kWebRtcDevSwitchNames)); 2805 arraysize(kWebRtcDevSwitchNames));
2805 } 2806 }
2806 } 2807 }
2807 #endif // defined(ENABLE_WEBRTC) 2808 #endif // defined(ENABLE_WEBRTC)
2808 2809
2809 } // namespace chrome 2810 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698