Refactor screenshot directory source

chrome/browser/ui/webui/screenshot_source.h

Index: chrome/browser/ui/webui/screenshot_source.h
diff --git a/chrome/browser/ui/webui/screenshot_source.h b/chrome/browser/ui/webui/screenshot_source.h
index 2445f85a9fe59003cd11036790c9f4c69152f113..f8e500ac47cc7d81240e5624c3f1c5f4f7637343 100644
--- a/chrome/browser/ui/webui/screenshot_source.h
+++ b/chrome/browser/ui/webui/screenshot_source.h
@@ -32,6 +32,16 @@ class ScreenshotSource : public ChromeURLDataManager::DataSource {
       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,
@@ -45,6 +55,15 @@ class ScreenshotSource : public ChromeURLDataManager::DataSource {
   // 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();