Commit 60249fc9 authored by sadrul@chromium.org's avatar sadrul@chromium.org

athena: Show the hostname in the caption instead of the page-title.

BUG=401569
R=oshima@chromium.org

Review URL: https://codereview.chromium.org/456243002

Cr-Commit-Position: refs/heads/master@{#289061}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289061 0039d316-1c4b-4281-b951-d872f2087c98
parent 92a80fef
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "athena/activity/public/activity_factory.h" #include "athena/activity/public/activity_factory.h"
#include "athena/activity/public/activity_manager.h" #include "athena/activity/public/activity_manager.h"
#include "athena/input/public/accelerator_manager.h" #include "athena/input/public/accelerator_manager.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_controller.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
...@@ -357,7 +358,9 @@ SkColor WebActivity::GetRepresentativeColor() const { ...@@ -357,7 +358,9 @@ SkColor WebActivity::GetRepresentativeColor() const {
} }
base::string16 WebActivity::GetTitle() const { base::string16 WebActivity::GetTitle() const {
return web_view_ ? web_view_->GetWebContents()->GetTitle() : base::string16(); return web_view_ ? base::UTF8ToUTF16(
web_view_->GetWebContents()->GetVisibleURL().host())
: base::string16();
} }
bool WebActivity::UsesFrame() const { bool WebActivity::UsesFrame() const {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment