Refactor screenshot directory source

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>
@@ skipping 14 matching lines @@
 class Profile;
 
 // 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,
       Profile* profile);
 
+#if defined(USE_ASH)

[sky, 2012/09/12 04:32:01]

Why is this ash specific?

[Harry McCleave, 2012/09/13 03:05:39]

It has been moved from an ash specific file, and is only used in ash specific
code paths, I assumed no point in bringing it out of here to just be clutter for
the linker to ignore?

+  // Queries the browser process to determine if screenshots are disabled.
+  static bool AreScreenshotsDisabled();
+  // Common access for the screenshot directory, parameter is set to the

[sky, 2012/09/12 04:32:01]

newline between 37/38

[Harry McCleave, 2012/09/13 03:05:39]

Done.

+  // requested directory and return value of true is given upon success.
+  static bool GetScreenshotDirectory(FilePath* directory);
+#endif
+  // Get the basefilename for screenshots

[sky, 2012/09/12 04:32:01]

newline between 41/42

[Harry McCleave, 2012/09/13 03:05:39]

Done.

+  static std::string GetScreenshotBaseFilename();
+
   // 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) OVERRIDE;
 
   virtual std::string GetMimeType(const std::string&) const OVERRIDE;
 
   // Get the screenshot specified by the given relative path that we've cached
   // from a previous request to the screenshots source.
   // Note: This method strips the query string from the given path.
   ScreenshotDataPtr GetCachedScreenshot(const std::string& screenshot_path);
 
+  static const char kScreenshotUrlRoot[];

[sky, 2012/09/12 04:32:01]

Document what all these are.

[Harry McCleave, 2012/09/13 03:05:39]

Done.

+  static const char kScreenshotCurrent[];
+  static const char kScreenshotSaved[];
+#if defined(OS_CHROMEOS)
+  static const char kScreenshotPrefix[];
+  static const char kScreenshotSuffix[];
+#endif
+
+

[sky, 2012/09/12 04:32:01]

nit: remove one of these newlines.

[Harry McCleave, 2012/09/13 03:05:39]

Done.

  private:
   virtual ~ScreenshotSource();
 
   // Send the screenshot specified by the given relative path to the requestor.
   // This is the ancestor for SendSavedScreenshot and CacheAndSendScreenshot.
   // All calls to send a screenshot should only call this method.
   // Note: This method strips the query string from the given path.
   void SendScreenshot(const std::string& screenshot_path, int request_id);
 #if defined(OS_CHROMEOS)
   // Send a saved screenshot image file specified by the given screenshot path
@@ skipping 23 matching lines @@
   Profile* profile_;
 
   // Key: Relative path to the screenshot (including filename)
   // Value: Pointer to the screenshot data associated with the path.
   std::map<std::string, ScreenshotDataPtr> cached_screenshots_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenshotSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_