4 files changed, 5 insertions, 5 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index f7a9ecb..d76ab775 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -111,7 +111,7 @@ bool HandleAccessibleFocusCycle(bool reverse) {
   if (!focus_manager)
     return false;
   views::View* view = focus_manager->GetFocusedView();
-  if (view->GetClassName() == views::WebView::kViewClassName)
+  if (!strcmp(view->GetClassName(), views::WebView::kViewClassName))
     return false;
 
   focus_manager->AdvanceFocus(reverse);
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index 911b272..b5731ad 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -131,7 +131,7 @@ class NetworkTrayView : public TrayItemView,
       network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
-  virtual std::string GetClassName() const OVERRIDE {
+  virtual const char* GetClassName() const OVERRIDE {
     return "NetworkTrayView";
   }
 
diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc
index 72c62ee..45cea61 100644
--- a/ash/wm/custom_frame_view_ash.cc
+++ b/ash/wm/custom_frame_view_ash.cc
@@ -37,7 +37,7 @@ const gfx::Font& GetTitleFont() {
 namespace ash {
 
 // static
-const char CustomFrameViewAsh::kViewClassName[] = "ash/wm/CustomFrameViewAsh";
+const char CustomFrameViewAsh::kViewClassName[] = "CustomFrameViewAsh";
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, public:
@@ -150,7 +150,7 @@ void CustomFrameViewAsh::OnPaint(gfx::Canvas* canvas) {
   canvas->Restore();
 }
 
-std::string CustomFrameViewAsh::GetClassName() const {
+const char* CustomFrameViewAsh::GetClassName() const {
   return kViewClassName;
 }
 
diff --git a/ash/wm/custom_frame_view_ash.h b/ash/wm/custom_frame_view_ash.h
index 5c3f0c3..b6ccf7f 100644
--- a/ash/wm/custom_frame_view_ash.h
+++ b/ash/wm/custom_frame_view_ash.h
@@ -68,7 +68,7 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView,
   // views::View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
-  virtual std::string GetClassName() const OVERRIDE;
+  virtual const char* GetClassName() const OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual gfx::Size GetMinimumSize() OVERRIDE;
   virtual gfx::Size GetMaximumSize() OVERRIDE;