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

Side by Side Diff: chrome/browser/ui/ash/screenshot_taker.cc

Issue 13105002: Screenshot effect non-obvious (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Callback 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 unified diff | Download patch
OLDNEW
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"
12 #include "ash/shell_window_ids.h"
13 #include "base/bind.h" 11 #include "base/bind.h"
14 #include "base/file_util.h" 12 #include "base/file_util.h"
15 #include "base/files/file_path.h"
16 #include "base/logging.h" 13 #include "base/logging.h"
17 #include "base/memory/ref_counted_memory.h" 14 #include "base/memory/ref_counted_memory.h"
18 #include "base/stringprintf.h" 15 #include "base/stringprintf.h"
19 #include "base/threading/sequenced_worker_pool.h" 16 #include "base/threading/sequenced_worker_pool.h"
20 #include "base/time.h" 17 #include "base/time.h"
18 #include "base/utf_string_conversions.h"
19 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/download/download_prefs.h" 20 #include "chrome/browser/download/download_prefs.h"
21 #include "chrome/browser/notifications/notification.h"
22 #include "chrome/browser/notifications/notification_ui_manager.h"
22 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/profiles/profile_manager.h"
24 #include "chrome/browser/ui/webui/screenshot_source.h" 24 #include "chrome/browser/ui/webui/screenshot_source.h"
25 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" 25 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
26 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
27 #include "grit/ash_strings.h"
28 #include "grit/theme_resources.h"
27 #include "ui/aura/root_window.h" 29 #include "ui/aura/root_window.h"
28 #include "ui/aura/window.h" 30 #include "ui/aura/window.h"
31 #include "ui/base/l10n/l10n_util.h"
32 #include "ui/base/resource/resource_bundle.h"
33 #include "ui/gfx/image/image.h"
29 34
30 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
31 #include "chrome/browser/chromeos/drive/drive_file_system_util.h" 36 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
37 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
32 #include "chrome/browser/chromeos/login/user_manager.h" 38 #include "chrome/browser/chromeos/login/user_manager.h"
33 #endif 39 #endif
34 40
35 namespace { 41 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 42 // The minimum interval between two screenshot commands. It has to be
44 // more than 1000 to prevent the conflict of filenames. 43 // more than 1000 to prevent the conflict of filenames.
45 const int kScreenshotMinimumIntervalInMS = 1000; 44 const int kScreenshotMinimumIntervalInMS = 1000;
46 45
46 const char kNotificationOriginUrl[] = "chrome://screenshot";
47 47
48 void SaveScreenshotInternal(const base::FilePath& screenshot_path, 48 // Delegate for a notification. This class has two roles: to implement callback
49 // methods for notification, and to provide an identity of the associated
50 // notification.
51 class ScreenshotTakerNotificationDelegate : public NotificationDelegate {
52 public:
53 ScreenshotTakerNotificationDelegate(const std::string& id_text,
54 bool success,
55 const base::FilePath& screenshot_path)
56 : id_text_(id_text),
57 success_(success),
58 screenshot_path_(screenshot_path) {
59 }
60
61 // Overridden from NotificationDelegate:
62 virtual void Display() OVERRIDE {}
63 virtual void Error() OVERRIDE {}
64 virtual void Close(bool by_user) OVERRIDE {}
65 virtual void Click() OVERRIDE {
66 if (!success_)
67 return;
68 #if defined(OS_CHROMEOS)
69 file_manager_util::ShowFileInFolder(screenshot_path_);
70 #else
71 // TODO(sschmitz): perhaps add similar action for Windows.
72 #endif
73 }
74 virtual std::string id() const OVERRIDE { return id_text_; }
75 virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE {
76 return NULL;
77 }
78
79 private:
80 virtual ~ScreenshotTakerNotificationDelegate() {}
81
82 const std::string id_text_;
83 const bool success_;
84 const base::FilePath screenshot_path_;
85
86 DISALLOW_COPY_AND_ASSIGN(ScreenshotTakerNotificationDelegate);
87 };
88
89 typedef base::Callback<
90 void(ScreenshotTakerObserver::Result screenshot_result,
91 const base::FilePath& screenshot_path)> ShowNotificationCallback;
92
93 void PostShowNotification(const ShowNotificationCallback& callback,
sky 2013/04/04 15:38:31 Calling this function takes as many lines as the i
sschmitz 2013/04/04 16:49:47 I inlined it. Done.
94 ScreenshotTakerObserver::Result screenshot_result,
95 const base::FilePath& screenshot_path) {
96 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
97 content::BrowserThread::PostTask(
98 content::BrowserThread::UI, FROM_HERE,
99 base::Bind(callback, screenshot_result, screenshot_path));
100 }
101
102 void SaveScreenshotInternal(const ShowNotificationCallback& callback,
103 const base::FilePath& screenshot_path,
49 scoped_refptr<base::RefCountedBytes> png_data) { 104 scoped_refptr<base::RefCountedBytes> png_data) {
50 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); 105 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
51 DCHECK(!screenshot_path.empty()); 106 DCHECK(!screenshot_path.empty());
107 ScreenshotTakerObserver::Result result =
108 ScreenshotTakerObserver::SCREENSHOT_SUCCESS;
52 if (static_cast<size_t>(file_util::WriteFile( 109 if (static_cast<size_t>(file_util::WriteFile(
53 screenshot_path, 110 screenshot_path,
54 reinterpret_cast<char*>(&(png_data->data()[0])), 111 reinterpret_cast<char*>(&(png_data->data()[0])),
55 png_data->size())) != png_data->size()) { 112 png_data->size())) != png_data->size()) {
56 LOG(ERROR) << "Failed to save to " << screenshot_path.value(); 113 LOG(ERROR) << "Failed to save to " << screenshot_path.value();
114 result = ScreenshotTakerObserver::SCREENSHOT_WRITE_FILE_FAILED;
57 } 115 }
116 PostShowNotification(callback, result, screenshot_path);
58 } 117 }
59 118
60 void SaveScreenshot(const base::FilePath& screenshot_path, 119 void SaveScreenshot(const ShowNotificationCallback& callback,
120 const base::FilePath& screenshot_path,
61 scoped_refptr<base::RefCountedBytes> png_data) { 121 scoped_refptr<base::RefCountedBytes> png_data) {
62 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); 122 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
63 DCHECK(!screenshot_path.empty()); 123 DCHECK(!screenshot_path.empty());
64 124
65 if (!file_util::CreateDirectory(screenshot_path.DirName())) { 125 if (!file_util::CreateDirectory(screenshot_path.DirName())) {
66 LOG(ERROR) << "Failed to ensure the existence of " 126 LOG(ERROR) << "Failed to ensure the existence of "
67 << screenshot_path.DirName().value(); 127 << screenshot_path.DirName().value();
128 PostShowNotification(callback,
129 ScreenshotTakerObserver::SCREENSHOT_CREATE_DIR_FAILED,
130 screenshot_path);
68 return; 131 return;
69 } 132 }
70 SaveScreenshotInternal(screenshot_path, png_data); 133 SaveScreenshotInternal(callback, screenshot_path, png_data);
71 } 134 }
72 135
73 // TODO(kinaba): crbug.com/140425, remove this ungly #ifdef dispatch. 136 // TODO(kinaba): crbug.com/140425, remove this ungly #ifdef dispatch.
74 #if defined(OS_CHROMEOS) 137 #if defined(OS_CHROMEOS)
75 void SaveScreenshotToDrive(scoped_refptr<base::RefCountedBytes> png_data, 138 void SaveScreenshotToDrive(const ShowNotificationCallback& callback,
139 scoped_refptr<base::RefCountedBytes> png_data,
76 drive::DriveFileError error, 140 drive::DriveFileError error,
77 const base::FilePath& local_path) { 141 const base::FilePath& local_path) {
78 if (error != drive::DRIVE_FILE_OK) { 142 if (error != drive::DRIVE_FILE_OK) {
79 LOG(ERROR) << "Failed to write screenshot image to Google Drive: " << error; 143 LOG(ERROR) << "Failed to write screenshot image to Google Drive: " << error;
144 PostShowNotification(
145 callback,
146 ScreenshotTakerObserver::SCREENSHOT_CREATE_FILE_FAILED,
147 local_path);
80 return; 148 return;
81 } 149 }
82 SaveScreenshotInternal(local_path, png_data); 150 SaveScreenshotInternal(callback, local_path, png_data);
83 } 151 }
84 152
85 void EnsureDirectoryExistsCallback( 153 void EnsureDirectoryExistsCallback(
154 const ShowNotificationCallback& callback,
86 Profile* profile, 155 Profile* profile,
87 const base::FilePath& screenshot_path, 156 const base::FilePath& screenshot_path,
88 scoped_refptr<base::RefCountedBytes> png_data, 157 scoped_refptr<base::RefCountedBytes> png_data,
89 drive::DriveFileError error) { 158 drive::DriveFileError error) {
90 // It is okay to fail with DRIVE_FILE_ERROR_EXISTS since anyway the directory 159 // It is okay to fail with DRIVE_FILE_ERROR_EXISTS since anyway the directory
91 // of the target file exists. 160 // of the target file exists.
92 if (error == drive::DRIVE_FILE_OK || 161 if (error == drive::DRIVE_FILE_OK ||
93 error == drive::DRIVE_FILE_ERROR_EXISTS) { 162 error == drive::DRIVE_FILE_ERROR_EXISTS) {
94 drive::util::PrepareWritableFileAndRun( 163 drive::util::PrepareWritableFileAndRun(
95 profile, 164 profile,
96 screenshot_path, 165 screenshot_path,
97 base::Bind(&SaveScreenshotToDrive, png_data)); 166 base::Bind(&SaveScreenshotToDrive, callback, png_data));
98 } else { 167 } else {
99 LOG(ERROR) << "Failed to ensure the existence of the specified directory " 168 LOG(ERROR) << "Failed to ensure the existence of the specified directory "
100 << "in Google Drive: " << error; 169 << "in Google Drive: " << error;
170 callback.Run(ScreenshotTakerObserver::SCREENSHOT_CHECK_DIR_FAILED,
171 screenshot_path);
101 } 172 }
102 } 173 }
103 174
104 void PostSaveScreenshotTask(const base::FilePath& screenshot_path, 175 void PostSaveScreenshotTask(const ShowNotificationCallback& callback,
176 Profile* profile,
177 const base::FilePath& screenshot_path,
105 scoped_refptr<base::RefCountedBytes> png_data) { 178 scoped_refptr<base::RefCountedBytes> png_data) {
106 if (drive::util::IsUnderDriveMountPoint(screenshot_path)) { 179 if (drive::util::IsUnderDriveMountPoint(screenshot_path)) {
107 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); 180 drive::util::EnsureDirectoryExists(
108 if (profile) { 181 profile,
109 drive::util::EnsureDirectoryExists( 182 screenshot_path.DirName(),
110 profile, 183 base::Bind(&EnsureDirectoryExistsCallback,
111 screenshot_path.DirName(), 184 callback,
112 base::Bind(&EnsureDirectoryExistsCallback, 185 profile,
113 profile, 186 screenshot_path,
114 screenshot_path, 187 png_data));
115 png_data));
116 }
117 } else { 188 } else {
118 content::BrowserThread::GetBlockingPool()->PostTask( 189 content::BrowserThread::GetBlockingPool()->PostTask(
119 FROM_HERE, base::Bind(&SaveScreenshot, screenshot_path, png_data)); 190 FROM_HERE, base::Bind(&SaveScreenshot,
191 callback,
192 screenshot_path,
193 png_data));
120 } 194 }
121 } 195 }
122 #else 196 #else
123 void PostSaveScreenshotTask(const base::FilePath& screenshot_path, 197 void PostSaveScreenshotTask(const ShowNotificationCallback& callback,
198 Profile* profile,
199 const base::FilePath& screenshot_path,
124 scoped_refptr<base::RefCountedBytes> png_data) { 200 scoped_refptr<base::RefCountedBytes> png_data) {
125 content::BrowserThread::GetBlockingPool()->PostTask( 201 content::BrowserThread::GetBlockingPool()->PostTask(
126 FROM_HERE, base::Bind(&SaveScreenshot, screenshot_path, png_data)); 202 FROM_HERE, base::Bind(&SaveScreenshot,
203 callback,
204 screenshot_path,
205 png_data));
127 } 206 }
128 #endif 207 #endif
129 208
130 bool GrabWindowSnapshot(aura::Window* window, 209 bool GrabWindowSnapshot(aura::Window* window,
131 const gfx::Rect& snapshot_bounds, 210 const gfx::Rect& snapshot_bounds,
132 std::vector<unsigned char>* png_data) { 211 std::vector<unsigned char>* png_data) {
133 #if defined(OS_LINUX) 212 #if defined(OS_LINUX)
134 // chrome::GrabWindowSnapshotForUser checks this too, but 213 // chrome::GrabWindowSnapshotForUser checks this too, but
135 // RootWindow::GrabSnapshot does not. 214 // RootWindow::GrabSnapshot does not.
136 if (ScreenshotSource::AreScreenshotsDisabled()) 215 if (ScreenshotSource::AreScreenshotsDisabled())
137 return false; 216 return false;
138 217
139 // We use XGetImage() for Linux/ChromeOS for performance reasons. 218 // We use XGetImage() for Linux/ChromeOS for performance reasons.
140 // See crbug.com/119492 219 // See crbug.com/119492
141 // TODO(mukai): remove this when the performance issue has been fixed. 220 // TODO(mukai): remove this when the performance issue has been fixed.
142 if (window->GetRootWindow()->GrabSnapshot(snapshot_bounds, png_data)) 221 if (window->GetRootWindow()->GrabSnapshot(snapshot_bounds, png_data))
143 return true; 222 return true;
144 #endif // OS_LINUX 223 #endif // OS_LINUX
145 224
146 return chrome::GrabWindowSnapshotForUser(window, png_data, snapshot_bounds); 225 return chrome::GrabWindowSnapshotForUser(window, png_data, snapshot_bounds);
147 } 226 }
148 227
149 } // namespace 228 } // namespace
150 229
151 ScreenshotTaker::ScreenshotTaker() { 230 ScreenshotTaker::ScreenshotTaker(Profile* profile)
231 : profile_(profile),
232 ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) {
233 DCHECK(profile_);
152 } 234 }
153 235
154 ScreenshotTaker::~ScreenshotTaker() { 236 ScreenshotTaker::~ScreenshotTaker() {
155 } 237 }
156 238
157 void ScreenshotTaker::HandleTakeScreenshotForAllRootWindows() { 239 void ScreenshotTaker::HandleTakeScreenshotForAllRootWindows() {
158 base::FilePath screenshot_directory; 240 base::FilePath screenshot_directory;
159 if (!ScreenshotSource::GetScreenshotDirectory(&screenshot_directory)) 241 if (!screenshot_directory_for_test_.empty()) {
242 screenshot_directory = screenshot_directory_for_test_;
243 } else if (!ScreenshotSource::GetScreenshotDirectory(&screenshot_directory)) {
244 ShowNotification(ScreenshotTakerObserver::SCREENSHOT_GET_DIR_FAILED,
245 base::FilePath());
160 return; 246 return;
247 }
248 std::string screenshot_basename = !screenshot_basename_for_test_.empty() ?
249 screenshot_basename_for_test_ :
250 ScreenshotSource::GetScreenshotBaseFilename();
161 251
162 std::string screenshot_basename =
163 ScreenshotSource::GetScreenshotBaseFilename();
164 ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows(); 252 ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
165 // Reorder root_windows to take the primary root window's snapshot at first. 253 // Reorder root_windows to take the primary root window's snapshot at first.
166 aura::RootWindow* primary_root = ash::Shell::GetPrimaryRootWindow(); 254 aura::RootWindow* primary_root = ash::Shell::GetPrimaryRootWindow();
167 if (*(root_windows.begin()) != primary_root) { 255 if (*(root_windows.begin()) != primary_root) {
168 root_windows.erase(std::find( 256 root_windows.erase(std::find(
169 root_windows.begin(), root_windows.end(), primary_root)); 257 root_windows.begin(), root_windows.end(), primary_root));
170 root_windows.insert(root_windows.begin(), primary_root); 258 root_windows.insert(root_windows.begin(), primary_root);
171 } 259 }
172 for (size_t i = 0; i < root_windows.size(); ++i) { 260 for (size_t i = 0; i < root_windows.size(); ++i) {
173 aura::RootWindow* root_window = root_windows[i]; 261 aura::RootWindow* root_window = root_windows[i];
174 scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes); 262 scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes);
175 std::string basename = screenshot_basename; 263 std::string basename = screenshot_basename;
176 gfx::Rect rect = root_window->bounds(); 264 gfx::Rect rect = root_window->bounds();
177 if (root_windows.size() > 1) 265 if (root_windows.size() > 1)
178 basename += base::StringPrintf(" - Display %d", static_cast<int>(i + 1)); 266 basename += base::StringPrintf(" - Display %d", static_cast<int>(i + 1));
267 base::FilePath screenshot_path =
268 screenshot_directory.AppendASCII(basename + ".png");
179 if (GrabWindowSnapshot(root_window, rect, &png_data->data())) { 269 if (GrabWindowSnapshot(root_window, rect, &png_data->data())) {
180 DisplayVisualFeedback(rect);
181 PostSaveScreenshotTask( 270 PostSaveScreenshotTask(
182 screenshot_directory.AppendASCII(basename + ".png"), png_data); 271 base::Bind(&ScreenshotTaker::ShowNotification, factory_.GetWeakPtr()),
272 profile_,
273 screenshot_path,
274 png_data);
183 } else { 275 } else {
184 LOG(ERROR) << "Failed to grab the window screenshot for " << i; 276 LOG(ERROR) << "Failed to grab the window screenshot for " << i;
277 ShowNotification(
278 ScreenshotTakerObserver::SCREENSHOT_GRABWINDOW_FULL_FAILED,
279 screenshot_path);
185 } 280 }
186 } 281 }
187 last_screenshot_timestamp_ = base::Time::Now(); 282 last_screenshot_timestamp_ = base::Time::Now();
188 } 283 }
189 284
190 void ScreenshotTaker::HandleTakePartialScreenshot( 285 void ScreenshotTaker::HandleTakePartialScreenshot(
191 aura::Window* window, const gfx::Rect& rect) { 286 aura::Window* window, const gfx::Rect& rect) {
192 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 287 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
193 288
194 base::FilePath screenshot_directory; 289 base::FilePath screenshot_directory;
195 if (!ScreenshotSource::GetScreenshotDirectory(&screenshot_directory)) 290 if (!screenshot_directory_for_test_.empty()) {
291 screenshot_directory = screenshot_directory_for_test_;
292 } else if (!ScreenshotSource::GetScreenshotDirectory(&screenshot_directory)) {
293 ShowNotification(ScreenshotTakerObserver::SCREENSHOT_GET_DIR_FAILED,
294 base::FilePath());
196 return; 295 return;
296 }
197 297
198 scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes); 298 scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes);
199 299
300 std::string screenshot_basename = !screenshot_basename_for_test_.empty() ?
301 screenshot_basename_for_test_ :
302 ScreenshotSource::GetScreenshotBaseFilename();
303 base::FilePath screenshot_path =
304 screenshot_directory.AppendASCII(screenshot_basename + ".png");
200 if (GrabWindowSnapshot(window, rect, &png_data->data())) { 305 if (GrabWindowSnapshot(window, rect, &png_data->data())) {
201 last_screenshot_timestamp_ = base::Time::Now(); 306 last_screenshot_timestamp_ = base::Time::Now();
202 DisplayVisualFeedback(rect);
203 PostSaveScreenshotTask( 307 PostSaveScreenshotTask(
204 screenshot_directory.AppendASCII( 308 base::Bind(&ScreenshotTaker::ShowNotification, factory_.GetWeakPtr()),
205 ScreenshotSource::GetScreenshotBaseFilename() + ".png"), 309 profile_,
206 png_data); 310 screenshot_path,
311 png_data);
207 } else { 312 } else {
208 LOG(ERROR) << "Failed to grab the window screenshot"; 313 LOG(ERROR) << "Failed to grab the window screenshot";
314 ShowNotification(
315 ScreenshotTakerObserver::SCREENSHOT_GRABWINDOW_PARTIAL_FAILED,
316 screenshot_path);
209 } 317 }
210 } 318 }
211 319
212 bool ScreenshotTaker::CanTakeScreenshot() { 320 bool ScreenshotTaker::CanTakeScreenshot() {
213 return last_screenshot_timestamp_.is_null() || 321 return last_screenshot_timestamp_.is_null() ||
214 base::Time::Now() - last_screenshot_timestamp_ > 322 base::Time::Now() - last_screenshot_timestamp_ >
215 base::TimeDelta::FromMilliseconds( 323 base::TimeDelta::FromMilliseconds(
216 kScreenshotMinimumIntervalInMS); 324 kScreenshotMinimumIntervalInMS);
217 } 325 }
218 326
219 void ScreenshotTaker::CloseVisualFeedbackLayer() { 327 void ScreenshotTaker::ShowNotification(
220 visual_feedback_layer_.reset(); 328 ScreenshotTakerObserver::Result screenshot_result,
329 const base::FilePath& screenshot_path) {
330 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
331 #if defined(OS_CHROMEOS)
332 // TODO(sschmitz): make this work for Windows.
333 static int id = 0;
334 std::string id_text = base::StringPrintf("screenshot_%3.3d", ++id);
335 string16 replace_id = UTF8ToUTF16(id_text);
336 bool success =
337 (screenshot_result == ScreenshotTakerObserver::SCREENSHOT_SUCCESS);
338 Notification notification(
339 GURL(kNotificationOriginUrl),
340 ui::ResourceBundle::GetSharedInstance().GetImageNamed(
341 IDR_SCREENSHOT_NOTIFICATION_ICON),
342 l10n_util::GetStringUTF16(
343 success ?
344 IDS_ASH_SCREENSHOT_NOTIFICATION_TITLE_SUCCESS :
345 IDS_ASH_SCREENSHOT_NOTIFICATION_TITLE_FAIL),
346 l10n_util::GetStringUTF16(
347 success ?
348 IDS_ASH_SCREENSHOT_NOTIFICATION_TEXT_SUCCESS :
349 IDS_ASH_SCREENSHOT_NOTIFICATION_TEXT_FAIL),
350 WebKit::WebTextDirectionDefault,
351 string16(),
352 replace_id,
353 new ScreenshotTakerNotificationDelegate(id_text,
354 success,
355 screenshot_path));
356 g_browser_process->notification_ui_manager()->Add(notification, profile_);
357 #endif
358
359 FOR_EACH_OBSERVER(ScreenshotTakerObserver, observers_,
360 OnScreenshotCompleted(screenshot_result, screenshot_path));
221 } 361 }
222 362
223 void ScreenshotTaker::DisplayVisualFeedback(const gfx::Rect& rect) { 363 void ScreenshotTaker::AddObserver(ScreenshotTakerObserver* observer) {
224 visual_feedback_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); 364 observers_.AddObserver(observer);
225 visual_feedback_layer_->SetColor(SK_ColorWHITE); 365 }
226 visual_feedback_layer_->SetOpacity(kVisualFeedbackLayerOpacity);
227 visual_feedback_layer_->SetBounds(rect);
228 366
229 ui::Layer* parent = ash::Shell::GetContainer( 367 void ScreenshotTaker::RemoveObserver(ScreenshotTakerObserver* observer) {
230 ash::Shell::GetActiveRootWindow(), 368 observers_.RemoveObserver(observer);
231 ash::internal::kShellWindowId_OverlayContainer)->layer(); 369 }
232 parent->Add(visual_feedback_layer_.get());
233 visual_feedback_layer_->SetVisible(true);
234 370
235 MessageLoopForUI::current()->PostDelayedTask( 371 bool ScreenshotTaker::HasObserver(ScreenshotTakerObserver* observer) const {
236 FROM_HERE, 372 return observers_.HasObserver(observer);
237 base::Bind(&ScreenshotTaker::CloseVisualFeedbackLayer,
238 base::Unretained(this)),
239 base::TimeDelta::FromMilliseconds(kVisualFeedbackLayerDisplayTimeMs));
240 } 373 }
374
375 void ScreenshotTaker::SetScreenshotDirectoryForTest(
376 const base::FilePath& directory) {
377 screenshot_directory_for_test_ = directory;
378 }
379
380 void ScreenshotTaker::SetScreenshotBasenameForTest(
381 const std::string& basename){
382 screenshot_basename_for_test_ = basename;
383 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698