Revert http://codereview.chromium.org/9838043/

chrome/browser/ui/views/ash/screenshot_taker.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/ash/screenshot_taker.h"
 
 #include <string>
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 48 matching lines @@
           screenshot_filename);
       if (!file_util::ReplaceFile(screenshot_path, real_path)) {
         LOG(ERROR) << "Failed to rename the file to " << real_path.value();
       }
     }
   } else {
     LOG(ERROR) << "Failed to save to " << screenshot_path.value();
   }
 }
 
-// Actually takes the screenshot.
-void TakeScreenshot(aura::Window* window, const gfx::Rect& rect) {
+// 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;
+
+}  // namespace
+
+ScreenshotTaker::ScreenshotTaker() {
+}
+
+ScreenshotTaker::~ScreenshotTaker() {
+}
+
+void ScreenshotTaker::HandleTakePartialScreenshot(
+    aura::Window* window, const gfx::Rect& rect) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   scoped_refptr<RefCountedBytes> png_data(new RefCountedBytes);
 
   bool is_logged_in = true;
 #if defined(OS_CHROMEOS)
   is_logged_in = chromeos::UserManager::Get()->IsUserLoggedIn();
 #endif
 
   if (browser::GrabWindowSnapshot(window, &png_data->data(), rect)) {
+    DisplayVisualFeedback(rect);
     content::BrowserThread::PostTask(
         content::BrowserThread::FILE, FROM_HERE,
         base::Bind(&SaveScreenshot, is_logged_in, png_data));
   } else {
     LOG(ERROR) << "Failed to grab the window screenshot";
   }
 }
 
-// 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;
-
-}  // namespace
-
-ScreenshotTaker::ScreenshotTaker() {
-}
-
-ScreenshotTaker::~ScreenshotTaker() {
-}
-
-void ScreenshotTaker::HandleTakePartialScreenshot(aura::Window* window,
-                                                  const gfx::Rect& rect) {
-  // browser::GrabWindowSnapshot takes ~100msec and making visual feedback after
-  // that leads noticeable delay.  To prevent this delay, we just make the
-  // visual effect first, and then run the actual task of taking screenshot.
-  DisplayVisualFeedback(
-      rect,
-      base::Bind(&TakeScreenshot, base::Unretained(window), rect));
-}
-
 void ScreenshotTaker::HandleTakeScreenshot(aura::Window* window) {
   HandleTakePartialScreenshot(window, window->bounds());
 }
 
-void ScreenshotTaker::CloseVisualFeedbackLayer(const base::Closure& task) {
+void ScreenshotTaker::CloseVisualFeedbackLayer() {
   visual_feedback_layer_.reset();
-  task.Run();
 }
 
-void ScreenshotTaker::DisplayVisualFeedback(const gfx::Rect& rect,
-                                            const base::Closure& task) {
+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::GetInstance()->GetContainer(
       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),
-                 task),
+                 base::Unretained(this)),
       base::TimeDelta::FromMilliseconds(kVisualFeedbackLayerDisplayTimeMs));
 }