athena/activity/activity_view_manager_impl.cc - Issue 322553004: Uses string16 for ActivityViewModel::GetTitle()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: athena/activity/activity_view_manager_impl.cc

Issue 322553004: Uses string16 for ActivityViewModel::GetTitle() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix typo of rebase Created 6 years, 6 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:

Index: athena/activity/activity_view_manager_impl.cc

diff --git a/athena/activity/activity_view_manager_impl.cc b/athena/activity/activity_view_manager_impl.cc

index d18879280f0b0bce616070ebb5b85086b503842e..5783481243cbdee61a64067bdf512aeb360870a8 100644

--- a/athena/activity/activity_view_manager_impl.cc

+++ b/athena/activity/activity_view_manager_impl.cc

@@ -10,7 +10,6 @@

#include "athena/activity/public/activity.h"

#include "athena/activity/public/activity_view_model.h"

#include "athena/screen/public/screen_manager.h"

-#include "base/strings/utf_string_conversions.h"

#include "ui/aura/window.h"

#include "ui/views/background.h"

#include "ui/views/controls/label.h"

@@ -59,8 +58,7 @@ class ActivityWidget : public views::LayoutManager {

}

void Update() {

- title_->SetText(

- base::UTF8ToUTF16(activity_->GetActivityViewModel()->GetTitle()));

+ title_->SetText(activity_->GetActivityViewModel()->GetTitle());

SkColor bgcolor =

activity_->GetActivityViewModel()->GetRepresentativeColor();

title_->set_background(views::Background::CreateSolidBackground(bgcolor));

« no previous file with comments | « no previous file | athena/activity/public/activity_view_model.h » ('j') | no next file with comments »