diff options
| author | jeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 07:20:57 +0000 |
|---|---|---|
| committer | jeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 07:20:57 +0000 |
| commit | 02fb6a407004640da8dc8d3fef077fe397b17600 (patch) | |
| tree | 141caec60a3e9af7ea453ea35d6742cb34279a8e /content/browser/browser_context.cc | |
| parent | 30d06382b2e09eefe82f5f45ec63018ff47092b4 (diff) | |
| download | chromium_src-02fb6a407004640da8dc8d3fef077fe397b17600.zip chromium_src-02fb6a407004640da8dc8d3fef077fe397b17600.tar.gz chromium_src-02fb6a407004640da8dc8d3fef077fe397b17600.tar.bz2 | |
Remove dependency on ui/base/clipboard/clipboard.h from browser_context.h
This dependency caused browser_context.h to depend on gdk/gdk.h, which was
problematic for targets that don't include the paths for gdk (particularly,
apps).
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14048020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_context.cc')
| -rw-r--r-- | content/browser/browser_context.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc index b998ac9..b32b58a 100644 --- a/content/browser/browser_context.cc +++ b/content/browser/browser_context.cc @@ -106,15 +106,15 @@ class OffTheRecordClipboardDestroyer : public base::SupportsUserData::Data { ExamineClipboard(clipboard, ui::Clipboard::BUFFER_SELECTION); } - ui::Clipboard::SourceTag GetAsSourceTag() { - return ui::Clipboard::SourceTag(this); + ui::SourceTag GetAsSourceTag() { + return ui::SourceTag(this); } private: void ExamineClipboard(ui::Clipboard* clipboard, ui::Clipboard::Buffer buffer) { - ui::Clipboard::SourceTag source_tag = clipboard->ReadSourceTag(buffer); - if (source_tag == ui::Clipboard::SourceTag(this)) + ui::SourceTag source_tag = clipboard->ReadSourceTag(buffer); + if (source_tag == ui::SourceTag(this)) clipboard->Clear(buffer); } }; @@ -311,7 +311,7 @@ void BrowserContext::PurgeMemory(BrowserContext* browser_context) { base::Bind(&PurgeDOMStorageContextInPartition)); } -ui::Clipboard::SourceTag BrowserContext::GetMarkerForOffTheRecordContext( +ui::SourceTag BrowserContext::GetMarkerForOffTheRecordContext( BrowserContext* context) { if (context && context->IsOffTheRecord()) { OffTheRecordClipboardDestroyer* clipboard_destroyer = @@ -319,7 +319,7 @@ ui::Clipboard::SourceTag BrowserContext::GetMarkerForOffTheRecordContext( return clipboard_destroyer->GetAsSourceTag(); } - return ui::Clipboard::SourceTag(); + return ui::SourceTag(); } #endif // !OS_IOS |