commit 90f399075f9082bf7031512d6579ec1196dc060a
author brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Oct 03 04:25:37 2009
committer brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Oct 03 04:25:37 2009
tree 8d47273615d98732a60d0e77a0787d1623204a4b
parent f0f400cb2e0a3c545d723524e8bbaf136caacf81

Move the clipboard stuff out of base and into app/clipboard. I renamed
clipboard_util to clipboard_util_win since it's Windows-only. This patch makes
test_shell depend on app as well. There should be no logic change.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/260003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27937 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/browser.cc

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 12231019..c685b5e 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -9,7 +9,6 @@
 #include "base/command_line.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
-#include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ -34,6 +33,7 @@
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/metrics/user_metrics.h"
+#include "chrome/browser/net/browser_url_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
@@ -866,7 +866,7 @@
   if (!contents->ShouldDisplayURL())
     return;
 
-  net::WriteURLToClipboard(
+  chrome_browser_net::WriteURLToClipboard(
       contents->GetURL(),
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
       g_browser_process->clipboard());