OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/ash/screenshot_taker.h" | 5 #include "chrome/browser/ui/ash/screenshot_taker.h" |
6 | 6 |
7 #include <climits> | 7 #include <climits> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
12 #include "ash/shell_window_ids.h" | 12 #include "ash/shell_window_ids.h" |
13 #include "base/bind.h" | 13 #include "base/bind.h" |
14 #include "base/file_util.h" | 14 #include "base/file_util.h" |
15 #include "base/files/file_path.h" | 15 #include "base/files/file_path.h" |
16 #include "base/logging.h" | 16 #include "base/logging.h" |
17 #include "base/memory/ref_counted_memory.h" | 17 #include "base/memory/ref_counted_memory.h" |
18 #include "base/stringprintf.h" | 18 #include "base/stringprintf.h" |
19 #include "base/threading/sequenced_worker_pool.h" | 19 #include "base/threading/sequenced_worker_pool.h" |
20 #include "base/time.h" | 20 #include "base/time.h" |
21 #include "base/utf_string_conversions.h" | |
22 #include "chrome/browser/browser_process.h" | |
23 #include "chrome/browser/chromeos/extensions/file_manager_util.h" | |
21 #include "chrome/browser/download/download_prefs.h" | 24 #include "chrome/browser/download/download_prefs.h" |
25 #include "chrome/browser/notifications/notification.h" | |
26 #include "chrome/browser/notifications/notification_ui_manager.h" | |
22 #include "chrome/browser/profiles/profile.h" | 27 #include "chrome/browser/profiles/profile.h" |
23 #include "chrome/browser/profiles/profile_manager.h" | 28 #include "chrome/browser/profiles/profile_manager.h" |
24 #include "chrome/browser/ui/webui/screenshot_source.h" | 29 #include "chrome/browser/ui/webui/screenshot_source.h" |
25 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" | 30 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" |
26 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
32 #include "grit/ash_strings.h" | |
33 #include "grit/theme_resources.h" | |
27 #include "ui/aura/root_window.h" | 34 #include "ui/aura/root_window.h" |
28 #include "ui/aura/window.h" | 35 #include "ui/aura/window.h" |
36 #include "ui/base/l10n/l10n_util.h" | |
37 #include "ui/base/resource/resource_bundle.h" | |
38 #include "ui/gfx/image/image.h" | |
29 | 39 |
30 #if defined(OS_CHROMEOS) | 40 #if defined(OS_CHROMEOS) |
31 #include "chrome/browser/chromeos/drive/drive_file_system_util.h" | 41 #include "chrome/browser/chromeos/drive/drive_file_system_util.h" |
32 #include "chrome/browser/chromeos/login/user_manager.h" | 42 #include "chrome/browser/chromeos/login/user_manager.h" |
33 #endif | 43 #endif |
34 | 44 |
35 namespace { | 45 namespace { |
36 // How opaque should the layer that we flash onscreen to provide visual | |
37 // feedback after the screenshot is taken be? | |
38 const float kVisualFeedbackLayerOpacity = 0.25f; | |
39 | |
40 // How long should the visual feedback layer be displayed? | |
41 const int64 kVisualFeedbackLayerDisplayTimeMs = 100; | |
42 | |
43 // The minimum interval between two screenshot commands. It has to be | 46 // The minimum interval between two screenshot commands. It has to be |
44 // more than 1000 to prevent the conflict of filenames. | 47 // more than 1000 to prevent the conflict of filenames. |
45 const int kScreenshotMinimumIntervalInMS = 1000; | 48 const int kScreenshotMinimumIntervalInMS = 1000; |
46 | 49 |
50 const char kNotificationOriginUrl[] = "chrome://screenshot"; | |
51 | |
52 class ScreenshotTakerNotificationDelegate : public NotificationDelegate { | |
53 public: | |
54 ScreenshotTakerNotificationDelegate(const std::string& id_text, | |
55 bool success, | |
56 const base::FilePath& screenshot_path) | |
57 : id_text_(id_text), | |
58 success_(success), | |
59 screenshot_path_(screenshot_path) { | |
60 } | |
61 | |
62 virtual void Display() OVERRIDE {} | |
63 | |
64 virtual void Error() OVERRIDE {} | |
65 | |
66 virtual void Close(bool by_user) OVERRIDE {} | |
67 | |
68 virtual void Click() OVERRIDE { | |
69 if (success_) | |
70 file_manager_util::ShowFileInFolder(screenshot_path_); | |
71 } | |
72 | |
73 virtual std::string id() const OVERRIDE { return id_text_; } | |
74 | |
75 virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE { | |
76 return NULL; | |
77 } | |
78 | |
79 private: | |
80 virtual ~ScreenshotTakerNotificationDelegate() {} | |
81 | |
82 std::string id_text_; | |
83 bool success_; | |
84 base::FilePath screenshot_path_; | |
85 | |
86 DISALLOW_COPY_AND_ASSIGN(ScreenshotTakerNotificationDelegate); | |
87 }; | |
88 | |
89 void ShowNotification(ScreenshotTakerObserver::Result screenshot_result, | |
90 const base::FilePath& screenshot_path) { | |
91 #if defined(OS_CHROMEOS) | |
92 // Notifications only on Chrome OS. | |
Jun Mukai
2013/03/29 23:01:37
I am not so sure the point here.
If so, no feedbac
sschmitz
2013/03/29 23:40:44
We had dicussions on this and decided non-ChromeOS
Jun Mukai
2013/03/30 00:37:17
Ah, got it. thanks!
sschmitz
2013/04/02 21:23:25
On second thought... and more discussions. I have
| |
93 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | |
94 static int id = 0; | |
95 std::string id_text = base::StringPrintf("screenshot_%3.3d", ++id); | |
96 string16 replace_id = UTF8ToUTF16(id_text); | |
97 bool success = | |
98 (screenshot_result == ScreenshotTakerObserver::SCREENSHOT_SUCCESS); | |
99 Notification notification( | |
100 GURL(kNotificationOriginUrl), | |
101 ui::ResourceBundle::GetSharedInstance().GetImageNamed( | |
102 IDR_SCREENSHOT_NOTIFICATION_ICON), | |
103 l10n_util::GetStringUTF16( | |
104 success ? | |
105 IDS_ASH_SCREENSHOT_NOTIFICATION_TITLE_SUCCESS : | |
106 IDS_ASH_SCREENSHOT_NOTIFICATION_TITLE_FAIL), | |
107 l10n_util::GetStringUTF16( | |
108 success ? | |
109 IDS_ASH_SCREENSHOT_NOTIFICATION_TEXT_SUCCESS : | |
110 IDS_ASH_SCREENSHOT_NOTIFICATION_TEXT_FAIL), | |
111 WebKit::WebTextDirectionDefault, | |
112 string16(), | |
113 replace_id, | |
114 new ScreenshotTakerNotificationDelegate(id_text, | |
115 success, | |
116 screenshot_path)); | |
117 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); | |
118 DCHECK(profile); | |
119 g_browser_process->notification_ui_manager()->Add(notification, profile); | |
120 | |
121 if (ScreenshotTaker::GetObserverForTest()) { | |
122 ScreenshotTaker::GetObserverForTest()->OnScreenshotCompleted( | |
123 screenshot_result, screenshot_path); | |
124 } | |
125 #endif | |
126 } | |
127 | |
128 void PostShowNotification(ScreenshotTakerObserver::Result screenshot_result, | |
129 const base::FilePath& screenshot_path) { | |
130 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); | |
131 content::BrowserThread::PostTask( | |
132 content::BrowserThread::UI, FROM_HERE, | |
133 base::Bind(&ShowNotification, screenshot_result, screenshot_path)); | |
134 } | |
47 | 135 |
48 void SaveScreenshotInternal(const base::FilePath& screenshot_path, | 136 void SaveScreenshotInternal(const base::FilePath& screenshot_path, |
49 scoped_refptr<base::RefCountedBytes> png_data) { | 137 scoped_refptr<base::RefCountedBytes> png_data) { |
50 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); | 138 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); |
51 DCHECK(!screenshot_path.empty()); | 139 DCHECK(!screenshot_path.empty()); |
52 if (static_cast<size_t>(file_util::WriteFile( | 140 if (static_cast<size_t>(file_util::WriteFile( |
53 screenshot_path, | 141 screenshot_path, |
54 reinterpret_cast<char*>(&(png_data->data()[0])), | 142 reinterpret_cast<char*>(&(png_data->data()[0])), |
55 png_data->size())) != png_data->size()) { | 143 png_data->size())) != png_data->size()) { |
56 LOG(ERROR) << "Failed to save to " << screenshot_path.value(); | 144 LOG(ERROR) << "Failed to save to " << screenshot_path.value(); |
145 PostShowNotification(ScreenshotTakerObserver::SCREENSHOT_WRITE_FILE_FAILED, | |
146 screenshot_path); | |
147 return; | |
57 } | 148 } |
149 PostShowNotification(ScreenshotTakerObserver::SCREENSHOT_SUCCESS, | |
150 screenshot_path); | |
58 } | 151 } |
59 | 152 |
60 void SaveScreenshot(const base::FilePath& screenshot_path, | 153 void SaveScreenshot(const base::FilePath& screenshot_path, |
61 scoped_refptr<base::RefCountedBytes> png_data) { | 154 scoped_refptr<base::RefCountedBytes> png_data) { |
62 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); | 155 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); |
63 DCHECK(!screenshot_path.empty()); | 156 DCHECK(!screenshot_path.empty()); |
64 | 157 |
65 if (!file_util::CreateDirectory(screenshot_path.DirName())) { | 158 if (!file_util::CreateDirectory(screenshot_path.DirName())) { |
66 LOG(ERROR) << "Failed to ensure the existence of " | 159 LOG(ERROR) << "Failed to ensure the existence of " |
67 << screenshot_path.DirName().value(); | 160 << screenshot_path.DirName().value(); |
161 PostShowNotification(ScreenshotTakerObserver::SCREENSHOT_CREATE_DIR_FAILED, | |
162 screenshot_path); | |
68 return; | 163 return; |
69 } | 164 } |
70 SaveScreenshotInternal(screenshot_path, png_data); | 165 SaveScreenshotInternal(screenshot_path, png_data); |
71 } | 166 } |
72 | 167 |
73 // TODO(kinaba): crbug.com/140425, remove this ungly #ifdef dispatch. | 168 // TODO(kinaba): crbug.com/140425, remove this ungly #ifdef dispatch. |
74 #if defined(OS_CHROMEOS) | 169 #if defined(OS_CHROMEOS) |
75 void SaveScreenshotToDrive(scoped_refptr<base::RefCountedBytes> png_data, | 170 void SaveScreenshotToDrive(scoped_refptr<base::RefCountedBytes> png_data, |
76 drive::DriveFileError error, | 171 drive::DriveFileError error, |
77 const base::FilePath& local_path) { | 172 const base::FilePath& local_path) { |
78 if (error != drive::DRIVE_FILE_OK) { | 173 if (error != drive::DRIVE_FILE_OK) { |
79 LOG(ERROR) << "Failed to write screenshot image to Google Drive: " << error; | 174 LOG(ERROR) << "Failed to write screenshot image to Google Drive: " << error; |
175 PostShowNotification( | |
176 ScreenshotTakerObserver::SCREENSHOT_CREATE_FILE_FAILED, local_path); | |
80 return; | 177 return; |
81 } | 178 } |
82 SaveScreenshotInternal(local_path, png_data); | 179 SaveScreenshotInternal(local_path, png_data); |
83 } | 180 } |
84 | 181 |
85 void EnsureDirectoryExistsCallback( | 182 void EnsureDirectoryExistsCallback( |
86 Profile* profile, | 183 Profile* profile, |
87 const base::FilePath& screenshot_path, | 184 const base::FilePath& screenshot_path, |
88 scoped_refptr<base::RefCountedBytes> png_data, | 185 scoped_refptr<base::RefCountedBytes> png_data, |
89 drive::DriveFileError error) { | 186 drive::DriveFileError error) { |
90 // It is okay to fail with DRIVE_FILE_ERROR_EXISTS since anyway the directory | 187 // It is okay to fail with DRIVE_FILE_ERROR_EXISTS since anyway the directory |
91 // of the target file exists. | 188 // of the target file exists. |
92 if (error == drive::DRIVE_FILE_OK || | 189 if (error == drive::DRIVE_FILE_OK || |
93 error == drive::DRIVE_FILE_ERROR_EXISTS) { | 190 error == drive::DRIVE_FILE_ERROR_EXISTS) { |
191 // Note: The last two arguments of SaveScreenshotToDrive are appended by | |
192 // PrepareWritableFileAndRun. | |
94 drive::util::PrepareWritableFileAndRun( | 193 drive::util::PrepareWritableFileAndRun( |
95 profile, | 194 profile, |
96 screenshot_path, | 195 screenshot_path, |
97 base::Bind(&SaveScreenshotToDrive, png_data)); | 196 base::Bind(&SaveScreenshotToDrive, png_data)); |
98 } else { | 197 } else { |
99 LOG(ERROR) << "Failed to ensure the existence of the specified directory " | 198 LOG(ERROR) << "Failed to ensure the existence of the specified directory " |
100 << "in Google Drive: " << error; | 199 << "in Google Drive: " << error; |
200 ShowNotification(ScreenshotTakerObserver::SCREENSHOT_CHECK_DIR_FAILED, | |
201 screenshot_path); | |
101 } | 202 } |
102 } | 203 } |
103 | 204 |
104 void PostSaveScreenshotTask(const base::FilePath& screenshot_path, | 205 void PostSaveScreenshotTask(const base::FilePath& screenshot_path, |
105 scoped_refptr<base::RefCountedBytes> png_data) { | 206 scoped_refptr<base::RefCountedBytes> png_data) { |
106 if (drive::util::IsUnderDriveMountPoint(screenshot_path)) { | 207 if (drive::util::IsUnderDriveMountPoint(screenshot_path)) { |
107 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); | 208 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); |
108 if (profile) { | 209 if (profile) { |
210 // Note: The last argument of EnsureDirectoryExistsCallback is | |
211 // appended by EnsureDirectoryExists. | |
109 drive::util::EnsureDirectoryExists( | 212 drive::util::EnsureDirectoryExists( |
110 profile, | 213 profile, |
111 screenshot_path.DirName(), | 214 screenshot_path.DirName(), |
112 base::Bind(&EnsureDirectoryExistsCallback, | 215 base::Bind(&EnsureDirectoryExistsCallback, |
113 profile, | 216 profile, |
114 screenshot_path, | 217 screenshot_path, |
115 png_data)); | 218 png_data)); |
116 } | 219 } |
117 } else { | 220 } else { |
118 content::BrowserThread::GetBlockingPool()->PostTask( | 221 content::BrowserThread::GetBlockingPool()->PostTask( |
(...skipping 22 matching lines...) Expand all Loading... | |
141 // TODO(mukai): remove this when the performance issue has been fixed. | 244 // TODO(mukai): remove this when the performance issue has been fixed. |
142 if (window->GetRootWindow()->GrabSnapshot(snapshot_bounds, png_data)) | 245 if (window->GetRootWindow()->GrabSnapshot(snapshot_bounds, png_data)) |
143 return true; | 246 return true; |
144 #endif // OS_LINUX | 247 #endif // OS_LINUX |
145 | 248 |
146 return chrome::GrabWindowSnapshotForUser(window, png_data, snapshot_bounds); | 249 return chrome::GrabWindowSnapshotForUser(window, png_data, snapshot_bounds); |
147 } | 250 } |
148 | 251 |
149 } // namespace | 252 } // namespace |
150 | 253 |
254 ScreenshotTakerObserver* ScreenshotTaker::observer_for_test_ = NULL; | |
255 | |
151 ScreenshotTaker::ScreenshotTaker() { | 256 ScreenshotTaker::ScreenshotTaker() { |
152 } | 257 } |
153 | 258 |
154 ScreenshotTaker::~ScreenshotTaker() { | 259 ScreenshotTaker::~ScreenshotTaker() { |
155 } | 260 } |
156 | 261 |
157 void ScreenshotTaker::HandleTakeScreenshotForAllRootWindows() { | 262 void ScreenshotTaker::HandleTakeScreenshotForAllRootWindows() { |
158 base::FilePath screenshot_directory; | 263 base::FilePath screenshot_directory; |
159 if (!ScreenshotSource::GetScreenshotDirectory(&screenshot_directory)) | 264 if (screenshot_directory_for_test_.get()) { |
265 screenshot_directory = *screenshot_directory_for_test_; | |
266 } else if (!ScreenshotSource::GetScreenshotDirectory(&screenshot_directory)) { | |
267 ShowNotification(ScreenshotTakerObserver::SCREENSHOT_GET_DIR_FAILED, | |
268 base::FilePath()); | |
160 return; | 269 return; |
270 } | |
161 | 271 |
162 std::string screenshot_basename = | 272 std::string screenshot_basename = |
163 ScreenshotSource::GetScreenshotBaseFilename(); | 273 ScreenshotSource::GetScreenshotBaseFilename(); |
164 ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows(); | 274 ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows(); |
165 // Reorder root_windows to take the primary root window's snapshot at first. | 275 // Reorder root_windows to take the primary root window's snapshot at first. |
166 aura::RootWindow* primary_root = ash::Shell::GetPrimaryRootWindow(); | 276 aura::RootWindow* primary_root = ash::Shell::GetPrimaryRootWindow(); |
167 if (*(root_windows.begin()) != primary_root) { | 277 if (*(root_windows.begin()) != primary_root) { |
168 root_windows.erase(std::find( | 278 root_windows.erase(std::find( |
169 root_windows.begin(), root_windows.end(), primary_root)); | 279 root_windows.begin(), root_windows.end(), primary_root)); |
170 root_windows.insert(root_windows.begin(), primary_root); | 280 root_windows.insert(root_windows.begin(), primary_root); |
171 } | 281 } |
172 for (size_t i = 0; i < root_windows.size(); ++i) { | 282 for (size_t i = 0; i < root_windows.size(); ++i) { |
173 aura::RootWindow* root_window = root_windows[i]; | 283 aura::RootWindow* root_window = root_windows[i]; |
174 scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes); | 284 scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes); |
175 std::string basename = screenshot_basename; | 285 std::string basename = screenshot_basename; |
176 gfx::Rect rect = root_window->bounds(); | 286 gfx::Rect rect = root_window->bounds(); |
177 if (root_windows.size() > 1) | 287 if (root_windows.size() > 1) |
178 basename += base::StringPrintf(" - Display %d", static_cast<int>(i + 1)); | 288 basename += base::StringPrintf(" - Display %d", static_cast<int>(i + 1)); |
289 base::FilePath screenshot_path = | |
290 screenshot_directory.AppendASCII(basename + ".png"); | |
179 if (GrabWindowSnapshot(root_window, rect, &png_data->data())) { | 291 if (GrabWindowSnapshot(root_window, rect, &png_data->data())) { |
180 DisplayVisualFeedback(rect); | 292 PostSaveScreenshotTask(screenshot_path, png_data); |
181 PostSaveScreenshotTask( | |
182 screenshot_directory.AppendASCII(basename + ".png"), png_data); | |
183 } else { | 293 } else { |
184 LOG(ERROR) << "Failed to grab the window screenshot for " << i; | 294 LOG(ERROR) << "Failed to grab the window screenshot for " << i; |
295 ShowNotification( | |
296 ScreenshotTakerObserver::SCREENSHOT_GRABWINDOW_FULL_FAILED, | |
297 screenshot_path); | |
185 } | 298 } |
186 } | 299 } |
187 last_screenshot_timestamp_ = base::Time::Now(); | 300 last_screenshot_timestamp_ = base::Time::Now(); |
188 } | 301 } |
189 | 302 |
190 void ScreenshotTaker::HandleTakePartialScreenshot( | 303 void ScreenshotTaker::HandleTakePartialScreenshot( |
191 aura::Window* window, const gfx::Rect& rect) { | 304 aura::Window* window, const gfx::Rect& rect) { |
192 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 305 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
193 | 306 |
194 base::FilePath screenshot_directory; | 307 base::FilePath screenshot_directory; |
195 if (!ScreenshotSource::GetScreenshotDirectory(&screenshot_directory)) | 308 if (screenshot_directory_for_test_.get()) { |
309 screenshot_directory = *screenshot_directory_for_test_; | |
310 } else if (!ScreenshotSource::GetScreenshotDirectory(&screenshot_directory)) { | |
311 ShowNotification(ScreenshotTakerObserver::SCREENSHOT_GET_DIR_FAILED, | |
312 base::FilePath()); | |
196 return; | 313 return; |
314 } | |
197 | 315 |
198 scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes); | 316 scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes); |
199 | 317 |
318 base::FilePath screenshot_path = | |
319 screenshot_directory.AppendASCII( | |
320 ScreenshotSource::GetScreenshotBaseFilename() + ".png"); | |
200 if (GrabWindowSnapshot(window, rect, &png_data->data())) { | 321 if (GrabWindowSnapshot(window, rect, &png_data->data())) { |
201 last_screenshot_timestamp_ = base::Time::Now(); | 322 last_screenshot_timestamp_ = base::Time::Now(); |
202 DisplayVisualFeedback(rect); | 323 PostSaveScreenshotTask(screenshot_path, png_data); |
203 PostSaveScreenshotTask( | |
204 screenshot_directory.AppendASCII( | |
205 ScreenshotSource::GetScreenshotBaseFilename() + ".png"), | |
206 png_data); | |
207 } else { | 324 } else { |
208 LOG(ERROR) << "Failed to grab the window screenshot"; | 325 LOG(ERROR) << "Failed to grab the window screenshot"; |
326 ShowNotification( | |
327 ScreenshotTakerObserver::SCREENSHOT_GRABWINDOW_PARTIAL_FAILED, | |
328 screenshot_path); | |
209 } | 329 } |
210 } | 330 } |
211 | 331 |
212 bool ScreenshotTaker::CanTakeScreenshot() { | 332 bool ScreenshotTaker::CanTakeScreenshot() { |
213 return last_screenshot_timestamp_.is_null() || | 333 return last_screenshot_timestamp_.is_null() || |
214 base::Time::Now() - last_screenshot_timestamp_ > | 334 base::Time::Now() - last_screenshot_timestamp_ > |
215 base::TimeDelta::FromMilliseconds( | 335 base::TimeDelta::FromMilliseconds( |
216 kScreenshotMinimumIntervalInMS); | 336 kScreenshotMinimumIntervalInMS); |
217 } | 337 } |
218 | 338 |
219 void ScreenshotTaker::CloseVisualFeedbackLayer() { | 339 void ScreenshotTaker::SetScreenshotDirectoryForTest( |
220 visual_feedback_layer_.reset(); | 340 const base::FilePath& directory) { |
341 screenshot_directory_for_test_.reset(new base::FilePath(directory)); | |
221 } | 342 } |
222 | 343 |
223 void ScreenshotTaker::DisplayVisualFeedback(const gfx::Rect& rect) { | 344 // static |
224 visual_feedback_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); | 345 void ScreenshotTaker::SetObserverForTest(ScreenshotTakerObserver* observer) { |
225 visual_feedback_layer_->SetColor(SK_ColorWHITE); | 346 observer_for_test_ = observer; |
226 visual_feedback_layer_->SetOpacity(kVisualFeedbackLayerOpacity); | 347 } |
227 visual_feedback_layer_->SetBounds(rect); | |
228 | 348 |
229 ui::Layer* parent = ash::Shell::GetContainer( | 349 // static |
230 ash::Shell::GetActiveRootWindow(), | 350 ScreenshotTakerObserver* ScreenshotTaker::GetObserverForTest() { |
231 ash::internal::kShellWindowId_OverlayContainer)->layer(); | 351 return observer_for_test_; |
232 parent->Add(visual_feedback_layer_.get()); | |
233 visual_feedback_layer_->SetVisible(true); | |
234 | |
235 MessageLoopForUI::current()->PostDelayedTask( | |
236 FROM_HERE, | |
237 base::Bind(&ScreenshotTaker::CloseVisualFeedbackLayer, | |
238 base::Unretained(this)), | |
239 base::TimeDelta::FromMilliseconds(kVisualFeedbackLayerDisplayTimeMs)); | |
240 } | 352 } |
OLD | NEW |