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

Unified 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: simplify Created 7 years, 9 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
« no previous file with comments | « chrome/browser/ui/ash/screenshot_taker.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/screenshot_taker.cc
diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc
index e5742f9dd8a57d100c2a75de28dde8fcefa44d0c..886795985cd8f32d3f2ae6b54018e5bb5bc44cb4 100644
--- a/chrome/browser/ui/ash/screenshot_taker.cc
+++ b/chrome/browser/ui/ash/screenshot_taker.cc
@@ -18,14 +18,24 @@
#include "base/stringprintf.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/extensions/file_manager_util.h"
#include "chrome/browser/download/download_prefs.h"
+#include "chrome/browser/notifications/notification.h"
+#include "chrome/browser/notifications/notification_ui_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/webui/screenshot_source.h"
#include "chrome/browser/ui/window_snapshot/window_snapshot.h"
#include "content/public/browser/browser_thread.h"
+#include "grit/ash_strings.h"
+#include "grit/theme_resources.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
@@ -33,28 +43,100 @@
#endif
namespace {
-// How opaque should the layer that we flash onscreen to provide visual
-// feedback after the screenshot is taken be?
-const float kVisualFeedbackLayerOpacity = 0.25f;
-
-// How long should the visual feedback layer be displayed?
-const int64 kVisualFeedbackLayerDisplayTimeMs = 100;
-
// The minimum interval between two screenshot commands. It has to be
// more than 1000 to prevent the conflict of filenames.
const int kScreenshotMinimumIntervalInMS = 1000;
+const char kNotificationOriginUrl[] = "chrome://screenshot";
+
+class ScreenshotTakerNotificationDelegate : public NotificationDelegate {
+ public:
+ ScreenshotTakerNotificationDelegate(const std::string& id_text,
+ bool success,
+ const base::FilePath& screenshot_path)
+ : id_text_(id_text),
+ success_(success),
+ screenshot_path_(screenshot_path) {
+ }
+
+ virtual void Display() OVERRIDE {}
+
+ virtual void Error() OVERRIDE {}
+
+ virtual void Close(bool by_user) OVERRIDE {}
+
+ virtual void Click() OVERRIDE {
+ if (success_)
+ file_manager_util::ShowFileInFolder(screenshot_path_);
+ }
+
+ virtual std::string id() const OVERRIDE { return id_text_; }
+
+ virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE {
+ return NULL;
+ }
+
+ private:
+ virtual ~ScreenshotTakerNotificationDelegate() {}
+
+ std::string id_text_;
+ bool success_;
+ base::FilePath screenshot_path_;
+
+ DISALLOW_COPY_AND_ASSIGN(ScreenshotTakerNotificationDelegate);
+};
+
+void ShowNotification(bool success, const base::FilePath& screenshot_path) {
+#if defined(OS_CHROMEOS)
+ // Notifications only on Chrome OS.
+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ static int id = 0;
+ std::string id_text = base::StringPrintf("screenshot_%3.3d", ++id);
+ string16 replace_id = UTF8ToUTF16(id_text);
+ Notification notification(
+ GURL(kNotificationOriginUrl),
+ ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+ IDR_SCREENSHOT_NOTIFICATION_ICON),
+ l10n_util::GetStringUTF16(
+ success ?
+ IDS_ASH_SCREENSHOT_NOTIFICATION_TITLE_SUCCESS :
+ IDS_ASH_SCREENSHOT_NOTIFICATION_TITLE_FAIL),
+ l10n_util::GetStringUTF16(
+ success ?
+ IDS_ASH_SCREENSHOT_NOTIFICATION_TEXT_SUCCESS :
+ IDS_ASH_SCREENSHOT_NOTIFICATION_TEXT_FAIL),
+ WebKit::WebTextDirectionDefault,
+ string16(),
+ replace_id,
+ new ScreenshotTakerNotificationDelegate(id_text,
+ success,
+ screenshot_path));
+ Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
+ DCHECK(profile);
+ DCHECK(g_browser_process);
James Cook 2013/03/27 22:40:29 nit: You don't need this DCHECK. If g_browser_proc
sschmitz 2013/03/28 18:46:22 Done.
+ g_browser_process->notification_ui_manager()->Add(notification, profile);
+#endif
+}
+
+void PostNotification(bool success, const base::FilePath& screenshot_path) {
James Cook 2013/03/27 22:40:29 Either comment or DCHECK which thread you expect t
sschmitz 2013/03/28 18:46:22 Done.
+ content::BrowserThread::PostTask(
+ content::BrowserThread::UI, FROM_HERE,
+ base::Bind(&ShowNotification, success, screenshot_path));
+}
void SaveScreenshotInternal(const base::FilePath& screenshot_path,
scoped_refptr<base::RefCountedBytes> png_data) {
DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
DCHECK(!screenshot_path.empty());
+ bool success = true;
if (static_cast<size_t>(file_util::WriteFile(
screenshot_path,
reinterpret_cast<char*>(&(png_data->data()[0])),
png_data->size())) != png_data->size()) {
LOG(ERROR) << "Failed to save to " << screenshot_path.value();
+ success = false;
}
+ PostNotification(success, screenshot_path);
}
void SaveScreenshot(const base::FilePath& screenshot_path,
@@ -65,6 +147,7 @@ void SaveScreenshot(const base::FilePath& screenshot_path,
if (!file_util::CreateDirectory(screenshot_path.DirName())) {
LOG(ERROR) << "Failed to ensure the existence of "
<< screenshot_path.DirName().value();
+ PostNotification(false, screenshot_path);
return;
}
SaveScreenshotInternal(screenshot_path, png_data);
@@ -77,6 +160,7 @@ void SaveScreenshotToDrive(scoped_refptr<base::RefCountedBytes> png_data,
const base::FilePath& local_path) {
if (error != drive::DRIVE_FILE_OK) {
LOG(ERROR) << "Failed to write screenshot image to Google Drive: " << error;
+ PostNotification(false, local_path);
return;
}
SaveScreenshotInternal(local_path, png_data);
@@ -91,6 +175,8 @@ void EnsureDirectoryExistsCallback(
// of the target file exists.
if (error == drive::DRIVE_FILE_OK ||
error == drive::DRIVE_FILE_ERROR_EXISTS) {
+ // Note: The last two arguments of SaveScreenshotToDrive are appended by
+ // PrepareWritableFileAndRun.
drive::util::PrepareWritableFileAndRun(
profile,
screenshot_path,
@@ -98,6 +184,7 @@ void EnsureDirectoryExistsCallback(
} else {
LOG(ERROR) << "Failed to ensure the existence of the specified directory "
<< "in Google Drive: " << error;
+ PostNotification(false, screenshot_path);
}
}
@@ -106,6 +193,8 @@ void PostSaveScreenshotTask(const base::FilePath& screenshot_path,
if (drive::util::IsUnderDriveMountPoint(screenshot_path)) {
Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
if (profile) {
+ // Note: The last argument of EnsureDirectoryExistsCallback is
+ // appended by EnsureDirectoryExists.
drive::util::EnsureDirectoryExists(
profile,
screenshot_path.DirName(),
@@ -176,12 +265,13 @@ void ScreenshotTaker::HandleTakeScreenshotForAllRootWindows() {
gfx::Rect rect = root_window->bounds();
if (root_windows.size() > 1)
basename += base::StringPrintf(" - Display %d", static_cast<int>(i + 1));
+ base::FilePath screenshot_path =
+ screenshot_directory.AppendASCII(basename + ".png");
if (GrabWindowSnapshot(root_window, rect, &png_data->data())) {
- DisplayVisualFeedback(rect);
- PostSaveScreenshotTask(
- screenshot_directory.AppendASCII(basename + ".png"), png_data);
+ PostSaveScreenshotTask(screenshot_path, png_data);
} else {
LOG(ERROR) << "Failed to grab the window screenshot for " << i;
+ ShowNotification(false, screenshot_path);
}
}
last_screenshot_timestamp_ = base::Time::Now();
@@ -197,15 +287,15 @@ void ScreenshotTaker::HandleTakePartialScreenshot(
scoped_refptr<base::RefCountedBytes> png_data(new base::RefCountedBytes);
+ base::FilePath screenshot_path =
+ screenshot_directory.AppendASCII(
+ ScreenshotSource::GetScreenshotBaseFilename() + ".png");
if (GrabWindowSnapshot(window, rect, &png_data->data())) {
last_screenshot_timestamp_ = base::Time::Now();
- DisplayVisualFeedback(rect);
- PostSaveScreenshotTask(
- screenshot_directory.AppendASCII(
- ScreenshotSource::GetScreenshotBaseFilename() + ".png"),
- png_data);
+ PostSaveScreenshotTask(screenshot_path, png_data);
} else {
LOG(ERROR) << "Failed to grab the window screenshot";
+ ShowNotification(false, screenshot_path);
}
}
@@ -215,26 +305,3 @@ bool ScreenshotTaker::CanTakeScreenshot() {
base::TimeDelta::FromMilliseconds(
kScreenshotMinimumIntervalInMS);
}
-
-void ScreenshotTaker::CloseVisualFeedbackLayer() {
- visual_feedback_layer_.reset();
-}
-
-void ScreenshotTaker::DisplayVisualFeedback(const gfx::Rect& rect) {
- visual_feedback_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
- visual_feedback_layer_->SetColor(SK_ColorWHITE);
- visual_feedback_layer_->SetOpacity(kVisualFeedbackLayerOpacity);
- visual_feedback_layer_->SetBounds(rect);
-
- ui::Layer* parent = ash::Shell::GetContainer(
- ash::Shell::GetActiveRootWindow(),
- ash::internal::kShellWindowId_OverlayContainer)->layer();
- parent->Add(visual_feedback_layer_.get());
- visual_feedback_layer_->SetVisible(true);
-
- MessageLoopForUI::current()->PostDelayedTask(
- FROM_HERE,
- base::Bind(&ScreenshotTaker::CloseVisualFeedbackLayer,
- base::Unretained(this)),
- base::TimeDelta::FromMilliseconds(kVisualFeedbackLayerDisplayTimeMs));
-}
« no previous file with comments | « chrome/browser/ui/ash/screenshot_taker.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698