athena/activity/public/activity_view_model.h - 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/public/activity_view_model.h

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/public/activity_view_model.h

diff --git a/athena/activity/public/activity_view_model.h b/athena/activity/public/activity_view_model.h

index b7eb2212a8cf4ac0d864a1c851fe9e81dd9765eb..9050a9b77809b13aba4625f21c4cb9700d98c5af 100644

--- a/athena/activity/public/activity_view_model.h

+++ b/athena/activity/public/activity_view_model.h

@@ -5,9 +5,8 @@

#ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_

#define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_

-#include <string>

#include "athena/athena_export.h"

+#include "base/strings/string16.h"

typedef unsigned int SkColor;

@@ -25,7 +24,7 @@ class ATHENA_EXPORT ActivityViewModel {

virtual SkColor GetRepresentativeColor() = 0;

// Returns a title for the activity.

- virtual std::string GetTitle() = 0;

+ virtual base::string16 GetTitle() = 0;

// Returns the contents view.

virtual views::View* GetContentsView() = 0;

« no previous file with comments | « athena/activity/activity_view_manager_impl.cc ('k') | athena/content/web_activity.h » ('j') | no next file with comments »