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

Unified Diff: athena/content/web_activity.cc

Issue 544813002: Support V1 app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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 | « athena/content/web_activity.h ('k') | athena/extensions/chrome/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/web_activity.cc
diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc
index 5223944177e637edfd3fe5340c32a92bbe0b01e4..4dca1c3aac557e2abf4ee8b16ba96bbc9de8ca40 100644
--- a/athena/content/web_activity.cc
+++ b/athena/content/web_activity.cc
@@ -222,8 +222,8 @@ class AthenaWebView : public views::WebView {
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:
@@ -325,8 +325,10 @@ class AthenaWebView : public views::WebView {
};
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),
@@ -424,6 +426,9 @@ SkColor WebActivity::GetRepresentativeColor() const {
}
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 sh
oshima 2014/09/05 16:45:27 Thanks. We probably should confirm if this is stil
return web_view_ ? base::UTF8ToUTF16(
web_view_->GetWebContents()->GetVisibleURL().host())
: base::string16();
« no previous file with comments | « athena/content/web_activity.h ('k') | athena/extensions/chrome/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698