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

Unified Diff: components/open_from_clipboard/clipboard_recent_content.cc

Issue 2801813003: Omnibox - ClipboardRecentContent - Make Proper Singleton (Closed)
Patch Set: fix iOS Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: components/open_from_clipboard/clipboard_recent_content.cc
diff --git a/components/open_from_clipboard/clipboard_recent_content.cc b/components/open_from_clipboard/clipboard_recent_content.cc
index a31a9d6f76aca9e1c9d9246573a3d54aecedde26..c0900e7fd3190b35c54bd89f6b0b7cca34bc7842 100644
--- a/components/open_from_clipboard/clipboard_recent_content.cc
+++ b/components/open_from_clipboard/clipboard_recent_content.cc
@@ -24,7 +24,6 @@ const char* kAuthorizedSchemes[] = {
ClipboardRecentContent::ClipboardRecentContent() {}
ClipboardRecentContent::~ClipboardRecentContent() {
- g_clipboard_recent_content = nullptr;
}
// static
@@ -33,8 +32,10 @@ ClipboardRecentContent* ClipboardRecentContent::GetInstance() {
}
// static
-void ClipboardRecentContent::SetInstance(ClipboardRecentContent* instance) {
- g_clipboard_recent_content = instance;
+void ClipboardRecentContent::SetInstance(
+ std::unique_ptr<ClipboardRecentContent> new_instance) {
+ delete g_clipboard_recent_content;
+ g_clipboard_recent_content = new_instance.release();
}
// static
« no previous file with comments | « components/open_from_clipboard/clipboard_recent_content.h ('k') | ios/chrome/browser/ios_chrome_main_parts.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698