athena: Show the theme-color in the title strip, and fix the height.

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 "content/public/browser/native_web_keyboard_event.h"
@@ skipping 102 matching lines @@
   }
 
   views::WebView* web_view_;
   bool reserved_accelerator_enabled_;
   scoped_ptr<AcceleratorManager> accelerator_manager_;
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(WebActivityController);
 };
 
+const SkColor kDefaultTitleColor = SK_ColorGRAY;
+const SkColor kDefaultUnavailableColor = SkColorSetRGB(0xbb, 0x77, 0x77);
+
 }  // namespace
 
 // A web view for athena's web activity. Note that AthenaWebView will create its
 // own content so that it can eject and reload it.
 class AthenaWebView : public views::WebView {
  public:
   AthenaWebView(content::BrowserContext* context)
       : views::WebView(context), controller_(new WebActivityController(this)),
         fullscreen_(false) {
     SetEmbedFullscreenWidgetMode(true);
@@ skipping 121 matching lines @@
   bool fullscreen_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaWebView);
 };
 
 WebActivity::WebActivity(content::BrowserContext* browser_context,
                          const GURL& url)
     : browser_context_(browser_context),
       url_(url),
       web_view_(NULL),
+      title_color_(kDefaultTitleColor),
       current_state_(ACTIVITY_UNLOADED) {
 }
 
 WebActivity::WebActivity(AthenaWebView* web_view)
     : browser_context_(web_view->browser_context()),
       url_(web_view->GetWebContents()->GetURL()),
       web_view_(web_view),
       current_state_(ACTIVITY_UNLOADED) {
   // Transition to state ACTIVITY_INVISIBLE to perform the same setup steps
   // as on new activities (namely adding a WebContentsObserver).
@@ skipping 68 matching lines @@
   return Activity::ACTIVITY_MEDIA_STATE_NONE;
 }
 
 void WebActivity::Init() {
   DCHECK(web_view_);
   web_view_->InstallAccelerators();
 }
 
 SkColor WebActivity::GetRepresentativeColor() const {
   // TODO(sad): Compute the color from the favicon.
-  return web_view_ ? SK_ColorGRAY : SkColorSetRGB(0xbb, 0x77, 0x77);
+  return web_view_ ? title_color_ : kDefaultUnavailableColor;
 }
 
 base::string16 WebActivity::GetTitle() const {
   return web_view_ ? web_view_->GetWebContents()->GetTitle() : base::string16();
 }
 
 bool WebActivity::UsesFrame() const {
   return true;
 }
 
@@ skipping 19 matching lines @@
 void WebActivity::TitleWasSet(content::NavigationEntry* entry,
                               bool explicit_set) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 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