Index: chrome/browser/ui/ash/screenshot_taker.h |
diff --git a/chrome/browser/ui/ash/screenshot_taker.h b/chrome/browser/ui/ash/screenshot_taker.h |
index 6ba0416277b03db6dd6c6429a6725b2c03b38091..c74a84fa558b67b13d765c375527c9ffdcdb53ac 100644 |
--- a/chrome/browser/ui/ash/screenshot_taker.h |
+++ b/chrome/browser/ui/ash/screenshot_taker.h |
@@ -8,13 +8,40 @@ |
#include "ash/screenshot_delegate.h" |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
+#include "base/memory/scoped_ptr.h" |
#include "base/time.h" |
-#include "ui/compositor/layer.h" |
namespace aura { |
class Window; |
} // namespace aura |
+namespace base { |
+class FilePath; |
+} // namespace base |
+ |
+namespace Screenshot { |
+enum Result { |
James Cook
2013/03/29 20:00:32
Move this into ScreenshotTakerObserver
sschmitz
2013/03/29 21:02:35
Done.
|
+ SCREENSHOT_SUCCESS = 0, |
+ SCREENSHOT_GRABWINDOW_PARTIAL_FAILED, |
+ SCREENSHOT_GRABWINDOW_FULL_FAILED, |
+ SCREENSHOT_CREATE_DIR_FAILED, |
+ SCREENSHOT_GET_DIR_FAILED, |
+ SCREENSHOT_CHECK_DIR_FAILED, |
+ SCREENSHOT_CREATE_FILE_FAILED, |
+ SCREENSHOT_WRITE_FILE_FAILED, |
+ SCREENSHOT_RESULT_COUNT // must be last |
James Cook
2013/03/29 20:00:32
Two spaces before comment and period at end (or ju
sschmitz
2013/03/29 21:02:35
Done.
|
+}; |
+} // namespace Screenshot |
+ |
+class ScreenshotTakerObserver { |
+ public: |
+ virtual ~ScreenshotTakerObserver() {} |
+ |
+ virtual void OnScreenshotCompleted( |
+ Screenshot::Result screenshot_result, |
+ const base::FilePath& screenshot_path) = 0; |
+}; |
+ |
class ScreenshotTaker : public ash::ScreenshotDelegate { |
public: |
ScreenshotTaker(); |
@@ -26,20 +53,20 @@ class ScreenshotTaker : public ash::ScreenshotDelegate { |
const gfx::Rect& rect) OVERRIDE; |
virtual bool CanTakeScreenshot() OVERRIDE; |
- private: |
- // Flashes the screen to provide visual feedback that a screenshot has |
- // been taken. |
- void DisplayVisualFeedback(const gfx::Rect& rect); |
+ // For test we override the screenshot directory for cleanup. |
+ void SetScreenshotDirectoryForTest(const base::FilePath& directory); |
- // Closes the visual feedback layer. |
- void CloseVisualFeedbackLayer(); |
+ // For test we observe the completion of a screenshot. |
+ static void SetObserverForTest(ScreenshotTakerObserver* observer); |
+ static ScreenshotTakerObserver* GetObserverForTest(); |
+ private: |
// The timestamp when the screenshot task was issued last time. |
base::Time last_screenshot_timestamp_; |
- // The flashing effect of the screen for the visual feedback when taking a |
- // screenshot. |
- scoped_ptr<ui::Layer> visual_feedback_layer_; |
+ scoped_ptr<base::FilePath> screenshot_directory_for_test_; |
+ |
+ static ScreenshotTakerObserver* s_observer_for_test; |
James Cook
2013/03/29 20:00:32
statics are observer_for_test_ like members.
sschmitz
2013/03/29 21:02:35
Done.
|
DISALLOW_COPY_AND_ASSIGN(ScreenshotTaker); |
}; |