athena: Show a progress-bar when loading a web-page.

athena/content/web_activity.cc

 // Copyright 2014 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 "athena/content/web_activity.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/input/public/accelerator_manager.h"
+#include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ui/aura/window.h"
+#include "ui/compositor/closure_animation_observer.h"
+#include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 namespace {
 
 class WebActivityController : public AcceleratorHandler {
  public:
@@ skipping 223 matching lines @@
                                           bool enter_fullscreen) OVERRIDE {
     fullscreen_ = enter_fullscreen;
     GetWidget()->SetFullscreen(fullscreen_);
   }
 
   virtual bool IsFullscreenForTabOrPending(
       const content::WebContents* web_contents) const OVERRIDE {
     return fullscreen_;
   }
 
+  virtual void LoadingStateChanged(content::WebContents* source,
+                                   bool to_different_document) OVERRIDE {
+    bool has_stopped = source == NULL || !source->IsLoading();
+    LoadProgressChanged(source, has_stopped ? 1 : 0);
+  }
+
+  virtual void LoadProgressChanged(content::WebContents* source,
+                                   double progress) OVERRIDE {
+    if (!progress)
+      return;

[Jun Mukai, 2014/08/30 09:04:18]

I think progress_bar_ should be reset here.
Otherwise, loading -> esc to cancel load will keep the progress bar.

[sadrul, 2014/08/30 15:06:48]

Cancelling the load triggers a LoadingStateChanged(), which calls
LoadProgressChanged() with progress = 1. (incidentally, it doesn't look like we
have esc to cancel loading in athena:
https://codereview.chromium.org/527473002/)

[Jun Mukai, 2014/08/30 16:24:18]

cool, I didn't know.

+
+    if (!progress_bar_) {
+      CreateProgressBar();
+      source->GetNativeView()->layer()->Add(progress_bar_.get());
+    }
+    progress_bar_->SetBounds(gfx::Rect(
+        0, 0, progress * progress_bar_->parent()->bounds().width(), 3));
+    if (progress < 1)
+      return;
+
+    ui::ScopedLayerAnimationSettings settings(progress_bar_->GetAnimator());

[Jun Mukai, 2014/08/30 09:04:18]

EASE_IN tween type in this case maybe?
http://www.google.com/design/spec/animation/authentic-motion.html#authentic-m...

[sadrul, 2014/08/30 15:06:48]

Done (Thanks for the link! Is there a specific section in that link you are
referring to that mention the animation setting for fade-out?)

[Jun Mukai, 2014/08/30 16:24:18]

I couldn't find the case specifically for fade-out. I think the
'entering-and-ending' can be applied here.

+    ui::Layer* layer = progress_bar_.get();
+    settings.AddObserver(new ui::ClosureAnimationObserver(
+        base::Bind(&base::DeletePointer<ui::Layer>, progress_bar_.release())));
+    layer->SetOpacity(0.f);
+  }
+
  private:
+  void CreateProgressBar() {
+    CHECK(!progress_bar_);
+    progress_bar_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
+    progress_bar_->SetColor(SkColorSetRGB(0x00, 0xb0, 0xc7));
+  }
+
   scoped_ptr<WebActivityController> controller_;
 
   // If the activity got evicted, this is the web content which holds the known
   // state of the content before eviction.
   scoped_ptr<content::WebContents> evicted_web_contents_;
 
+  scoped_ptr<ui::Layer> progress_bar_;
+
   // TODO(oshima): Find out if we should support window fullscreen.
   // It may still useful when a user is in split mode.
   bool fullscreen_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaWebView);
 };
 
 WebActivity::WebActivity(content::BrowserContext* browser_context,
                          const GURL& url)
     : browser_context_(browser_context),
@@ skipping 136 matching lines @@
 void WebActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void WebActivity::DidChangeThemeColor(SkColor theme_color) {
   title_color_ = theme_color;
 }
 
 }  // namespace athena