Support V1 app

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"
@@ skipping 204 matching lines @@
         load_url_params.transferred_global_request_id =
             params.transferred_global_request_id;
         web_contents()->GetController().LoadURLWithParams(load_url_params);
         return web_contents();
       }
       case NEW_FOREGROUND_TAB:
       case NEW_BACKGROUND_TAB:
       case NEW_POPUP:
       case NEW_WINDOW: {
         ActivityManager::Get()->AddActivity(
-            ActivityFactory::Get()->CreateWebActivity(browser_context(),
-                                                      params.url));
+            ActivityFactory::Get()->CreateWebActivity(
+                browser_context(), base::string16(), params.url));
         break;
       }
       default:
         break;
     }
     // NULL is returned if the URL wasn't opened immediately.
     return NULL;
   }
 
   virtual bool CanOverscrollContent() const OVERRIDE {
@@ skipping 81 matching lines @@
   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 base::string16& title,
                          const GURL& url)
     : browser_context_(browser_context),
+      title_(title),
       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),
@@ skipping 77 matching lines @@
   DCHECK(web_view_);
   web_view_->InstallAccelerators();
 }
 
 SkColor WebActivity::GetRepresentativeColor() const {
   // TODO(sad): Compute the color from the favicon.
   return web_view_ ? title_color_ : kDefaultUnavailableColor;
 }
 
 base::string16 WebActivity::GetTitle() const {
+  if (!title_.empty())
+    return title_;
+  // TODO(oshima): Use title set by the web contents.

[sadrul, 2014/09/05 15:48:26]

We used to show the page-title, but switched to showing the domain because of
feedback from UX.

[oshima, 2014/09/05 16:45:27]

Thanks. We probably should confirm if this is still true for V1/hosted apps.

   return web_view_ ? base::UTF8ToUTF16(
                          web_view_->GetWebContents()->GetVisibleURL().host())
                    : base::string16();
 }
 
 bool WebActivity::UsesFrame() const {
   return true;
 }
 
 views::View* WebActivity::GetContentsView() {
@@ skipping 72 matching lines @@
 
 void WebActivity::ReloadAndObserve() {
   if (web_view_->IsContentEvicted()) {
     DCHECK_EQ(ACTIVITY_UNLOADED, current_state_);
     web_view_->ReloadContent();
   }
   Observe(web_view_->GetWebContents());
 }
 
 }  // namespace athena