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..ca18421b44fb8d7c4f03fc9554d3bacfab8e19fc 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; |
Peter Kasting
2017/04/05 23:23:51
Why are you removing this line? The only effect o
Mark P
2017/04/06 17:58:00
No, that's not the only effect.
If someone create
Peter Kasting
2017/04/06 19:35:41
OK. I think my assumption mentally is that creati
Mark P
2017/04/06 23:25:27
Acknowledged.
|
} |
// static |
@@ -34,6 +33,7 @@ ClipboardRecentContent* ClipboardRecentContent::GetInstance() { |
// static |
void ClipboardRecentContent::SetInstance(ClipboardRecentContent* instance) { |
Peter Kasting
2017/04/05 23:23:51
Is there an advantage of having this setter at all
Mark P
2017/04/06 17:58:00
Oh, do you mean have the constructor set the globa
Peter Kasting
2017/04/06 19:35:41
True, but sort of makes sense if no one is ever ex
Mark P
2017/04/06 23:25:27
Left as-is because the side effect of what you pro
|
+ DCHECK(g_clipboard_recent_content == nullptr); |
g_clipboard_recent_content = instance; |
} |