diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 08:32:27 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 08:32:27 +0000 |
| commit | 707bd37ed8d42c6030cb43c889d343da8d218f90 (patch) | |
| tree | 49096d56e7c0306ea616478f1cdfc313116364f9 /ash | |
| parent | d9c7755e6c948dcd57cd6777b22b32602741d0ea (diff) | |
| download | chromium_src-707bd37ed8d42c6030cb43c889d343da8d218f90.zip chromium_src-707bd37ed8d42c6030cb43c889d343da8d218f90.tar.gz chromium_src-707bd37ed8d42c6030cb43c889d343da8d218f90.tar.bz2 | |
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
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 2 | ||||
| -rw-r--r-- | ash/system/chromeos/network/tray_network.cc | 2 | ||||
| -rw-r--r-- | ash/wm/custom_frame_view_ash.cc | 4 | ||||
| -rw-r--r-- | ash/wm/custom_frame_view_ash.h | 2 |
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; |