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

Side by Side Diff: chrome/common/content_settings_pattern.cc

Issue 12378016: chrome: Update include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/common/content_settings_pattern.h" 5 #include "chrome/common/content_settings_pattern.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/string_split.h"
11 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/strings/string_split.h"
12 #include "chrome/common/content_settings_pattern_parser.h" 12 #include "chrome/common/content_settings_pattern_parser.h"
13 #include "chrome/common/render_messages.h" 13 #include "chrome/common/render_messages.h"
14 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
15 #include "extensions/common/constants.h" 15 #include "extensions/common/constants.h"
16 #include "googleurl/src/gurl.h" 16 #include "googleurl/src/gurl.h"
17 #include "googleurl/src/url_canon.h" 17 #include "googleurl/src/url_canon.h"
18 #include "ipc/ipc_message_utils.h" 18 #include "ipc/ipc_message_utils.h"
19 #include "net/base/dns_util.h" 19 #include "net/base/dns_util.h"
20 #include "net/base/net_util.h" 20 #include "net/base/net_util.h"
21 21
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 if (!parts.is_port_wildcard && other_parts.is_port_wildcard) 660 if (!parts.is_port_wildcard && other_parts.is_port_wildcard)
661 return ContentSettingsPattern::PREDECESSOR; 661 return ContentSettingsPattern::PREDECESSOR;
662 662
663 int result = parts.port.compare(other_parts.port); 663 int result = parts.port.compare(other_parts.port);
664 if (result == 0) 664 if (result == 0)
665 return ContentSettingsPattern::IDENTITY; 665 return ContentSettingsPattern::IDENTITY;
666 if (result > 0) 666 if (result > 0)
667 return ContentSettingsPattern::DISJOINT_ORDER_PRE; 667 return ContentSettingsPattern::DISJOINT_ORDER_PRE;
668 return ContentSettingsPattern::DISJOINT_ORDER_POST; 668 return ContentSettingsPattern::DISJOINT_ORDER_POST;
669 } 669 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client_unittest.cc ('k') | chrome/common/extensions/api/extension_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698