Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1268)

Side by Side Diff: ui/base/clipboard/clipboard.cc

Issue 658963003: Change Clipboard to use virtual methods for testing purposes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/base/clipboard/clipboard.h ('k') | ui/base/clipboard/clipboard_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/clipboard/clipboard.h" 5 #include "ui/base/clipboard/clipboard.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 81 }
82 82
83 DCHECK(found); 83 DCHECK(found);
84 } 84 }
85 85
86 ClipboardMap* clipboard_map = g_clipboard_map.Pointer(); 86 ClipboardMap* clipboard_map = g_clipboard_map.Pointer();
87 ClipboardMap::iterator it = clipboard_map->find(id); 87 ClipboardMap::iterator it = clipboard_map->find(id);
88 if (it != clipboard_map->end()) 88 if (it != clipboard_map->end())
89 return it->second; 89 return it->second;
90 90
91 Clipboard* clipboard = new ui::Clipboard; 91 Clipboard* clipboard = Clipboard::Create();
92 clipboard_map->insert(std::make_pair(id, clipboard)); 92 clipboard_map->insert(std::make_pair(id, clipboard));
93 return clipboard; 93 return clipboard;
94 } 94 }
95 95
96 void Clipboard::DestroyClipboardForCurrentThread() { 96 void Clipboard::DestroyClipboardForCurrentThread() {
97 base::AutoLock lock(g_clipboard_map_lock.Get()); 97 base::AutoLock lock(g_clipboard_map_lock.Get());
98 98
99 ClipboardMap* clipboard_map = g_clipboard_map.Pointer(); 99 ClipboardMap* clipboard_map = g_clipboard_map.Pointer();
100 base::PlatformThreadId id = base::PlatformThread::CurrentId(); 100 base::PlatformThreadId id = base::PlatformThread::CurrentId();
101 ClipboardMap::iterator it = clipboard_map->find(id); 101 ClipboardMap::iterator it = clipboard_map->find(id);
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 iter->second[0].clear(); 224 iter->second[0].clear();
225 for (size_t i = 0; i < sizeof(SharedMemory*); ++i) 225 for (size_t i = 0; i < sizeof(SharedMemory*); ++i)
226 iter->second[0].push_back(reinterpret_cast<char*>(&bitmap)[i]); 226 iter->second[0].push_back(reinterpret_cast<char*>(&bitmap)[i]);
227 has_shared_bitmap = true; 227 has_shared_bitmap = true;
228 } 228 }
229 } 229 }
230 return true; 230 return true;
231 } 231 }
232 232
233 } // namespace ui 233 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/clipboard/clipboard.h ('k') | ui/base/clipboard/clipboard_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698