diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-03 04:25:37 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-03 04:25:37 +0000 |
| commit | 90f399075f9082bf7031512d6579ec1196dc060a (patch) | |
| tree | 8d47273615d98732a60d0e77a0787d1623204a4b /chrome/browser/autocomplete | |
| parent | f0f400cb2e0a3c545d723524e8bbaf136caacf81 (diff) | |
| download | chromium_src-90f399075f9082bf7031512d6579ec1196dc060a.zip chromium_src-90f399075f9082bf7031512d6579ec1196dc060a.tar.gz chromium_src-90f399075f9082bf7031512d6579ec1196dc060a.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/autocomplete')
3 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index 56fb434..6675a42 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -5,10 +5,11 @@ #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #include <Carbon/Carbon.h> // kVK_Return + +#include "app/clipboard/clipboard.h" #include "app/gfx/font.h" #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" -#include "base/clipboard.h" #import "base/cocoa_protocols_mac.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm index c57a5b4..59ce3bc 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm @@ -4,9 +4,9 @@ #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" -#include "base/clipboard.h" +#include "app/clipboard/clipboard.h" +#include "app/clipboard/scoped_clipboard_writer.h" #include "base/gfx/size.h" -#include "base/scoped_clipboard_writer.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 5af7976..e58422c 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -6,6 +6,8 @@ #include <locale> +#include "app/clipboard/clipboard.h" +#include "app/clipboard/scoped_clipboard_writer.h" #include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" @@ -15,12 +17,10 @@ #include "base/base_drag_source.h" #include "base/base_drop_target.h" #include "base/basictypes.h" -#include "base/clipboard.h" #include "base/iat_patch.h" #include "base/keyboard_codes.h" #include "base/lazy_instance.h" #include "base/ref_counted.h" -#include "base/scoped_clipboard_writer.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/autocomplete/autocomplete_accessibility.h" |