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

Unified Diff: chrome/browser/dom_ui/dom_ui_thumbnail_source.h

Issue 3061009: Speculative fix for crash in DOMUIThumbnailSource. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: msvc++ caught this Created 10 years, 5 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
« no previous file with comments | « chrome/browser/dom_ui/dom_ui_theme_source.cc ('k') | chrome/browser/dom_ui/dom_ui_thumbnail_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/dom_ui_thumbnail_source.h
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h b/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
index cf4fd794afaaede9f16ebf8984469d48271f5149..ce007f57826b47f7b1eee6a9c3c9ca1f3503d27d 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
+++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,8 +7,6 @@
#pragma once
#include <string>
-#include <utility>
-#include <vector>
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
@@ -31,18 +29,14 @@ class DOMUIThumbnailSource : public ChromeURLDataManager::DataSource {
bool is_off_the_record,
int request_id);
- virtual std::string GetMimeType(const std::string&) const {
- // We need to explicitly return a mime type, otherwise if the user tries to
- // drag the image they get no extension.
- return "image/png";
- }
+ virtual std::string GetMimeType(const std::string&) const;
// Called when thumbnail data is available from the history backend.
void OnThumbnailDataAvailable(HistoryService::Handle request_handle,
scoped_refptr<RefCountedBytes> data);
private:
- ~DOMUIThumbnailSource() {}
+ virtual ~DOMUIThumbnailSource();
// Send the default thumbnail when we are missing a real one.
void SendDefaultThumbnail(int request_id);
@@ -54,10 +48,6 @@ class DOMUIThumbnailSource : public ChromeURLDataManager::DataSource {
// database doesn't have a thumbnail for a webpage.
scoped_refptr<RefCountedMemory> default_thumbnail_;
- // Store requests when the ThumbnailStore isn't ready. When a notification is
- // received that it is ready, then serve these requests.
- std::vector<std::pair<std::string, int> > pending_requests_;
-
// To register to be notified when the ThumbnailStore is ready.
NotificationRegistrar registrar_;
« no previous file with comments | « chrome/browser/dom_ui/dom_ui_theme_source.cc ('k') | chrome/browser/dom_ui/dom_ui_thumbnail_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698