diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
| tree | 382278a54ce7a744d62fa510a9a80688cc12434b /chrome/common/extensions/url_pattern.h | |
| parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
| download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 | |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'chrome/common/extensions/url_pattern.h')
| -rw-r--r-- | chrome/common/extensions/url_pattern.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/common/extensions/url_pattern.h b/chrome/common/extensions/url_pattern.h index c0f17af..56deed5 100644 --- a/chrome/common/extensions/url_pattern.h +++ b/chrome/common/extensions/url_pattern.h @@ -114,6 +114,14 @@ class URLPattern { // Parse() instead, which returns success or failure. URLPattern(int valid_schemes, const std::string& pattern); +#if defined(_MSC_VER) && _MSC_VER >= 1600 + // Note: don't use this directly. This exists so URLPattern can be used + // with STL containers. Starting with Visual Studio 2010, we can't have this + // method private and use "friend class std::vector<URLPattern>;" as we used + // to do. + URLPattern(); +#endif + ~URLPattern(); // Gets the bitmask of valid schemes. @@ -201,11 +209,13 @@ class URLPattern { }; private: +#if !(defined(_MSC_VER) && _MSC_VER >= 1600) friend class std::vector<URLPattern>; // Note: don't use this directly. This exists so URLPattern can be used // with STL containers. URLPattern(); +#endif // A bitmask containing the schemes which are considered valid for this // pattern. Parse() uses this to decide whether a pattern contains a valid |