| Index: net/base/url_util.h
|
| diff --git a/chrome/common/net/url_util.h b/net/base/url_util.h
|
| similarity index 59%
|
| copy from chrome/common/net/url_util.h
|
| copy to net/base/url_util.h
|
| index f6bf2963f7636aa4c2628e5b6cf802ae556c7f23..5d5e58bc617950158014ad22f0f62f5d24d5dfcc 100644
|
| --- a/chrome/common/net/url_util.h
|
| +++ b/net/base/url_util.h
|
| @@ -1,24 +1,17 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2013 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_COMMON_NET_URL_UTIL_H_
|
| -#define CHROME_COMMON_NET_URL_UTIL_H_
|
| +#ifndef NET_BASE_URL_UTIL_H_
|
| +#define NET_BASE_URL_UTIL_H_
|
|
|
| #include <string>
|
|
|
| -class GURL;
|
| -
|
| -namespace ui {
|
| -class Clipboard;
|
| -}
|
| +#include "net/base/net_export.h"
|
|
|
| -namespace chrome_common_net {
|
| +class GURL;
|
|
|
| -// Writes a string representation of |url| to the system clipboard.
|
| -void WriteURLToClipboard(const GURL& url,
|
| - const std::string& languages,
|
| - ui::Clipboard *clipboard);
|
| +namespace net {
|
|
|
| // Returns a new GURL by appending the given query parameter name and the
|
| // value. Unsafe characters in the name and the value are escaped like
|
| @@ -30,9 +23,9 @@ void WriteURLToClipboard(const GURL& url,
|
| // => "http://example.com?name=value"
|
| // AppendQueryParameter(GURL("http://example.com?x=y"), "name", "value").spec()
|
| // => "http://example.com?x=y&name=value"
|
| -GURL AppendQueryParameter(const GURL& url,
|
| - const std::string& name,
|
| - const std::string& value);
|
| +NET_EXPORT GURL AppendQueryParameter(const GURL& url,
|
| + const std::string& name,
|
| + const std::string& value);
|
|
|
| // Returns a new GURL by appending or replacing the given query parameter name
|
| // and the value. If |name| appears more than once, only the first name-value
|
| @@ -47,17 +40,17 @@ GURL AppendQueryParameter(const GURL& url,
|
| // AppendOrReplaceQueryParameter(
|
| // GURL("http://example.com?x=y&name=old"), "name", "new").spec()
|
| // => "http://example.com?x=y&name=new"
|
| -GURL AppendOrReplaceQueryParameter(const GURL& url,
|
| - const std::string& name,
|
| - const std::string& value);
|
| +NET_EXPORT GURL AppendOrReplaceQueryParameter(const GURL& url,
|
| + const std::string& name,
|
| + const std::string& value);
|
|
|
| // Looks for |search_key| in the query portion of |url|. Returns true if the
|
| // key is found and sets |out_value| to the unescaped value for the key.
|
| // Returns false if the key is not found.
|
| -bool GetValueForKeyInQuery(const GURL& url,
|
| - const std::string& search_key,
|
| - std::string* out_value);
|
| +NET_EXPORT bool GetValueForKeyInQuery(const GURL& url,
|
| + const std::string& search_key,
|
| + std::string* out_value);
|
|
|
| -} // namespace chrome_common_net
|
| +} // namespace net
|
|
|
| -#endif // CHROME_COMMON_NET_URL_UTIL_H_
|
| +#endif // NET_BASE_URL_UTIL_H_
|
|
|