Fix saved screenshots for feedback.

chrome/browser/ui/webui/screenshot_source.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/memory/linked_ptr.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
+typedef std::vector<unsigned char> ScreenshotData;
+typedef linked_ptr<ScreenshotData> ScreenshotDataPtr;
+
 // ScreenshotSource is the data source that serves screenshots (saved
 // or current) to the bug report html ui
 class ScreenshotSource : public ChromeURLDataManager::DataSource {
  public:
   explicit ScreenshotSource(
       std::vector<unsigned char>* current_screenshot);
 
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id);
 
   virtual std::string GetMimeType(const std::string&) const;
 
-  std::vector<unsigned char> GetScreenshot(const std::string& path);
+  ScreenshotDataPtr GetCachedScreenshot(const std::string& path);
 
  private:
   virtual ~ScreenshotSource();
 
-  std::vector<unsigned char> current_screenshot_;
+  // Sends the screenshot data to the requestor while caching it locally to the
+  // class instance, indexed by path.
+  void CacheAndSendScreenshot(const std::string& path,
+                              int request_id,
+                              ScreenshotDataPtr bytes);
+  void SendScreenshot(const std::string& path, int request_id);
+#if defined(OS_CHROMEOS)
+  void SendSavedScreenshot(const std::string& filename, int request_id);

[Daniel Erat, 2011/08/22 16:42:02]

headers should have comments describing what functions do -- i don't understand
the difference between SendScreenshot() and SendSavedScreenshot() when looking
at this file.

also don't understand why SendScreenshot()'s parameter is named |path| and
SendSavedScreenshot()'s is named |filename|.  is the former a full path and the
latter just a basename?  if there's no difference, please give them the same
names.

[rkc, 2011/08/23 10:25:20]

Done.

+#endif
+
+  ScreenshotDataPtr current_screenshot_;
+  std::map<std::string, ScreenshotDataPtr> cached_screenshots_;

[Daniel Erat, 2011/08/22 16:42:02]

add a comment here describing what you're using as the map's key

[rkc, 2011/08/23 10:25:20]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(ScreenshotSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_