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

Unified Diff: chrome/browser/ui/ash/screenshot_taker.h

Issue 14027009: Crash when taking screenshot onto Chrome OS Google Drive (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: improved Created 7 years, 8 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
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 091823e1a67237498ff67ce57d5e9b1881f84a69..c8c04f5fbdd2d6b1d78bd9ec914625e58f0a8616 100644
--- a/chrome/browser/ui/ash/screenshot_taker.h
+++ b/chrome/browser/ui/ash/screenshot_taker.h
@@ -49,7 +49,7 @@ class ScreenshotTakerObserver {
class ScreenshotTaker : public ash::ScreenshotDelegate {
public:
- explicit ScreenshotTaker(Profile* profile);
+ ScreenshotTaker();
virtual ~ScreenshotTaker();
@@ -70,10 +70,10 @@ class ScreenshotTaker : public ash::ScreenshotDelegate {
private:
friend class ash::test::ScreenshotTakerTest;
+ Profile* GetProfile();
void SetScreenshotDirectoryForTest(const base::FilePath& directory);
void SetScreenshotBasenameForTest(const std::string& basename);
-
- Profile* profile_;
+ void SetScreenshotProfileForTest(Profile* profile);
base::WeakPtrFactory<ScreenshotTaker> factory_;
@@ -81,8 +81,10 @@ class ScreenshotTaker : public ash::ScreenshotDelegate {
base::Time last_screenshot_timestamp_;
ObserverList<ScreenshotTakerObserver> observers_;
+
base::FilePath screenshot_directory_for_test_;
std::string screenshot_basename_for_test_;
+ Profile* profile_for_test_;
DISALLOW_COPY_AND_ASSIGN(ScreenshotTaker);
};

Powered by Google App Engine
This is Rietveld 408576698