From 707bd37ed8d42c6030cb43c889d343da8d218f90 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Thu, 9 May 2013 08:32:27 +0000 Subject: views: Convert View::GetClassName() to return const char*. BUG=235984 R=jamescook@chromium.org,sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/14676008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199164 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/view.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ui/views/view.cc') diff --git a/ui/views/view.cc b/ui/views/view.cc index dacc36a..bae1d82 100644 --- a/ui/views/view.cc +++ b/ui/views/view.cc @@ -613,13 +613,13 @@ void View::SetLayoutManager(LayoutManager* layout_manager) { // Attributes ------------------------------------------------------------------ -std::string View::GetClassName() const { +const char* View::GetClassName() const { return kViewClassName; } View* View::GetAncestorWithClassName(const std::string& name) { for (View* view = this; view; view = view->parent_) { - if (view->GetClassName() == name) + if (!strcmp(view->GetClassName(), name.c_str())) return view; } return NULL; @@ -1562,7 +1562,8 @@ std::string View::DoPrintViewGraph(bool first, View* view_with_children) { // Node characteristics. char p[kMaxPointerStringLength]; - size_t base_name_index = GetClassName().find_last_of('/'); + const std::string class_name(GetClassName()); + size_t base_name_index = class_name.find_last_of('/'); if (base_name_index == std::string::npos) base_name_index = 0; else @@ -1576,7 +1577,7 @@ std::string View::DoPrintViewGraph(bool first, View* view_with_children) { result.append(p + 2); result.append(" [label=\""); - result.append(GetClassName().substr(base_name_index).c_str()); + result.append(class_name.substr(base_name_index).c_str()); base::snprintf(bounds_buffer, arraysize(bounds_buffer), -- cgit v1.1