diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 21:08:21 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 21:08:21 +0000 |
commit | 2dfeaf9c751b9ff269ca8bcd8f9e4902a0c9012c (patch) | |
tree | 86e7ab4c054af5723245dc0bdead5c08a308a466 /chrome/browser/net | |
parent | 6f1d18ebd4dd4315b02197c4593ad905a9049f8b (diff) | |
download | chromium_src-2dfeaf9c751b9ff269ca8bcd8f9e4902a0c9012c.zip chromium_src-2dfeaf9c751b9ff269ca8bcd8f9e4902a0c9012c.tar.gz chromium_src-2dfeaf9c751b9ff269ca8bcd8f9e4902a0c9012c.tar.bz2 |
Move clipboard from app/ to ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6135006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r-- | chrome/browser/net/browser_url_util.cc | 6 | ||||
-rw-r--r-- | chrome/browser/net/browser_url_util.h | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/net/browser_url_util.cc b/chrome/browser/net/browser_url_util.cc index 786ab7d..8471140 100644 --- a/chrome/browser/net/browser_url_util.cc +++ b/chrome/browser/net/browser_url_util.cc @@ -4,18 +4,18 @@ #include "chrome/browser/net/browser_url_util.h" -#include "app/clipboard/scoped_clipboard_writer.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" +#include "ui/base/clipboard/scoped_clipboard_writer.h" namespace chrome_browser_net { void WriteURLToClipboard(const GURL& url, const std::string& languages, - Clipboard *clipboard) { + ui::Clipboard *clipboard) { if (url.is_empty() || !url.is_valid() || !clipboard) return; @@ -26,7 +26,7 @@ void WriteURLToClipboard(const GURL& url, net::FormatUrl(url, languages, net::kFormatUrlOmitNothing, UnescapeRule::NONE, NULL, NULL, NULL); - ScopedClipboardWriter scw(clipboard); + ui::ScopedClipboardWriter scw(clipboard); scw.WriteURL(text); } diff --git a/chrome/browser/net/browser_url_util.h b/chrome/browser/net/browser_url_util.h index 043725f7..2199d36 100644 --- a/chrome/browser/net/browser_url_util.h +++ b/chrome/browser/net/browser_url_util.h @@ -8,15 +8,18 @@ #include <string> -class Clipboard; class GURL; +namespace ui { +class Clipboard; +} + namespace chrome_browser_net { // Writes a string representation of |url| to the system clipboard. void WriteURLToClipboard(const GURL& url, const std::string& languages, - Clipboard *clipboard); + ui::Clipboard *clipboard); } // namespace chrome_browser_net |