summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-05 04:14:11 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-05 04:14:11 +0000
commit1b8d02f181d089ee670f2ba72089c3722f679d5f (patch)
tree42ca83bfe4ffe27afa3e67179749826bb40869e2 /chrome/browser/autocomplete
parent80720414325af11e0dccedaf8c8f65998f91ec76 (diff)
downloadchromium_src-1b8d02f181d089ee670f2ba72089c3722f679d5f.zip
chromium_src-1b8d02f181d089ee670f2ba72089c3722f679d5f.tar.gz
chromium_src-1b8d02f181d089ee670f2ba72089c3722f679d5f.tar.bz2
Get rid of the ClipboardService class and header... it is nothing but a shell around base::Clipboard now.
http://crbug.com/11387 Review URL: http://codereview.chromium.org/105011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_win.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 4543c30..8649df7 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -30,7 +30,6 @@
#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/views/location_bar_view.h"
-#include "chrome/common/clipboard_service.h"
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/gfx/utils.h"
#include "chrome/common/l10n_util.h"
@@ -1145,7 +1144,7 @@ void AutocompleteEditViewWin::OnCopy() {
if (text.empty())
return;
- ScopedClipboardWriter scw(g_browser_process->clipboard_service());
+ ScopedClipboardWriter scw(g_browser_process->clipboard());
scw.WriteText(text);
// Check if the user is copying the whole address bar. If they are, we
@@ -2092,7 +2091,7 @@ void AutocompleteEditViewWin::TextChanged() {
std::wstring AutocompleteEditViewWin::GetClipboardText() const {
// Try text format.
- ClipboardService* clipboard = g_browser_process->clipboard_service();
+ Clipboard* clipboard = g_browser_process->clipboard();
if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType())) {
std::wstring text;
clipboard->ReadText(&text);