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

Side by Side Diff: webkit/plugins/npapi/plugin_list.cc

Issue 18191004: webkit: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync+rebase Created 7 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
« no previous file with comments | « webkit/plugins/npapi/plugin_instance.h ('k') | webkit/plugins/npapi/plugin_stream.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 #include "webkit/plugins/npapi/plugin_list.h" 5 #include "webkit/plugins/npapi/plugin_list.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string_split.h" 12 #include "base/strings/string_split.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/sys_string_conversions.h" 14 #include "base/strings/sys_string_conversions.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "googleurl/src/gurl.h"
17 #include "net/base/mime_util.h" 16 #include "net/base/mime_util.h"
17 #include "url/gurl.h"
18 #include "webkit/plugins/npapi/plugin_utils.h" 18 #include "webkit/plugins/npapi/plugin_utils.h"
19 #include "webkit/plugins/plugin_switches.h" 19 #include "webkit/plugins/plugin_switches.h"
20 20
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 #include "webkit/plugins/npapi/plugin_constants_win.h" 22 #include "webkit/plugins/npapi/plugin_constants_win.h"
23 #endif 23 #endif
24 24
25 namespace { 25 namespace {
26 26
27 using webkit::npapi::PluginList; 27 using webkit::npapi::PluginList;
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 } 471 }
472 return false; 472 return false;
473 } 473 }
474 474
475 PluginList::~PluginList() { 475 PluginList::~PluginList() {
476 } 476 }
477 477
478 478
479 } // namespace npapi 479 } // namespace npapi
480 } // namespace webkit 480 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/plugin_instance.h ('k') | webkit/plugins/npapi/plugin_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698