summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormiletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 21:58:35 +0000
committermiletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 21:58:35 +0000
commit7a2f31b12bffb11a251f10397b1855e0cb0b52ed (patch)
tree13c1eaf7a832e9cfdb39bd301d635c4e2ed91487 /chrome
parent7bf8dd0db776c6f7652c2fd8e12b8bb7e92333fa (diff)
downloadchromium_src-7a2f31b12bffb11a251f10397b1855e0cb0b52ed.zip
chromium_src-7a2f31b12bffb11a251f10397b1855e0cb0b52ed.tar.gz
chromium_src-7a2f31b12bffb11a251f10397b1855e0cb0b52ed.tar.bz2
Add some missing view class name to better debug view
hierarchy. BUG= TEST= Review URL: http://codereview.chromium.org/7024025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc19
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bar_view.h4
-rw-r--r--chrome/browser/ui/views/frame/browser_root_view.cc8
-rw-r--r--chrome/browser/ui/views/frame/browser_root_view.h6
-rw-r--r--chrome/browser/ui/views/omnibox/omnibox_view_views.cc8
-rw-r--r--chrome/browser/ui/views/omnibox/omnibox_view_views.h4
-rw-r--r--chrome/browser/ui/views/reload_button.cc7
-rw-r--r--chrome/browser/ui/views/reload_button.h4
-rw-r--r--chrome/browser/ui/views/toolbar_view.cc6
-rw-r--r--chrome/browser/ui/views/toolbar_view.h4
10 files changed, 69 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index d965a3a..8ac480e 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -82,6 +82,10 @@ static const int kBarHeight = 28;
// Preferred height of the bookmarks bar when only shown on the new tab page.
const int BookmarkBarView::kNewtabBarHeight = 57;
+// static
+const char BookmarkBarView::kViewClassName[] =
+ "browser/ui/views/bookmarks/BookmarkBarView";
+
// Padding between buttons.
static const int kButtonPadding = 0;
@@ -128,6 +132,9 @@ namespace {
class BookmarkButton : public views::TextButton {
public:
+ // The internal view class name.
+ static const char kViewClassName[];
+
BookmarkButton(views::ButtonListener* listener,
const GURL& url,
const std::wstring& title,
@@ -157,6 +164,10 @@ class BookmarkButton : public views::TextButton {
return event_utils::IsPossibleDispositionEvent(e);
}
+ virtual std::string GetClassName() const OVERRIDE {
+ return kViewClassName;
+ }
+
private:
const GURL& url_;
Profile* profile_;
@@ -165,6 +176,10 @@ class BookmarkButton : public views::TextButton {
DISALLOW_COPY_AND_ASSIGN(BookmarkButton);
};
+// static for BookmarkButton
+const char BookmarkButton::kViewClassName[] =
+ "browser/ui/views/bookmarks/BookmarkButton";
+
// BookmarkFolderButton -------------------------------------------------------
// Buttons used for folders on the bookmark bar, including the 'other folders'
@@ -847,6 +862,10 @@ void BookmarkBarView::OnThemeChanged() {
UpdateColors();
}
+std::string BookmarkBarView::GetClassName() const {
+ return kViewClassName;
+}
+
void BookmarkBarView::GetAccessibleState(ui::AccessibleViewState* state) {
state->role = ui::AccessibilityTypes::ROLE_TOOLBAR;
state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index bd4a891..f04aa79 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -56,6 +56,9 @@ class BookmarkBarView : public DetachableToolbarView,
public BookmarkMenuController::Observer,
public BookmarkBarInstructionsView::Delegate {
public:
+ // The internal view class name.
+ static const char kViewClassName[];
+
// Constants used in Browser View, as well as here.
// How inset the bookmarks bar is when displayed on the new tab page.
static const int kNewtabHorizontalPadding;
@@ -178,6 +181,7 @@ class BookmarkBarView : public DetachableToolbarView,
virtual void ShowContextMenu(const gfx::Point& p,
bool is_mouse_gesture) OVERRIDE;
virtual void OnThemeChanged() OVERRIDE;
+ virtual std::string GetClassName() const OVERRIDE;
// AccessiblePaneView methods:
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc
index 323cd35..64a03f1 100644
--- a/chrome/browser/ui/views/frame/browser_root_view.cc
+++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -19,6 +19,10 @@
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/l10n/l10n_util.h"
+// static
+const char BrowserRootView::kViewClassName[] =
+ "browser/ui/views/frame/BrowserRootView";
+
BrowserRootView::BrowserRootView(BrowserView* browser_view,
views::Widget* widget)
: views::internal::RootView(widget),
@@ -114,6 +118,10 @@ void BrowserRootView::GetAccessibleState(ui::AccessibleViewState* state) {
state->name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
}
+std::string BrowserRootView::GetClassName() const {
+ return kViewClassName;
+}
+
bool BrowserRootView::ShouldForwardToTabStrip(
const views::DropTargetEvent& event) {
if (!tabstrip()->IsVisible())
diff --git a/chrome/browser/ui/views/frame/browser_root_view.h b/chrome/browser/ui/views/frame/browser_root_view.h
index 6f93861..c1f3d77 100644
--- a/chrome/browser/ui/views/frame/browser_root_view.h
+++ b/chrome/browser/ui/views/frame/browser_root_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -22,6 +22,9 @@ class OSExchangeData;
// TabStrip.
class BrowserRootView : public views::internal::RootView {
public:
+ // Internal class name.
+ static const char kViewClassName[];
+
// You must call set_tabstrip before this class will accept drops.
BrowserRootView(BrowserView* browser_view, views::Widget* widget);
@@ -36,6 +39,7 @@ class BrowserRootView : public views::internal::RootView {
virtual void OnDragExited() OVERRIDE;
virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+ virtual std::string GetClassName() const OVERRIDE;
private:
// Returns true if the event should be forwarded to the tabstrip.
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index e694fc7..32c65d9 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -116,6 +116,10 @@ const SkColor kSecurityErrorSchemeColor = SK_ColorRED;
} // namespace
+// static
+const char OmniboxViewViews::kViewClassName[] =
+ "browser/ui/views/omnibox/OmniboxViewViews";
+
OmniboxViewViews::OmniboxViewViews(AutocompleteEditController* controller,
ToolbarModel* toolbar_model,
Profile* profile,
@@ -276,6 +280,10 @@ void OmniboxViewViews::GetAccessibleState(ui::AccessibleViewState* state) {
state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
}
+std::string OmniboxViewViews::GetClassName() const {
+ return kViewClassName;
+}
+
////////////////////////////////////////////////////////////////////////////////
// OmniboxViewViews, AutocopmleteEditView implementation:
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
index 1840c80..3ce4b72 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -43,6 +43,9 @@ class OmniboxViewViews : public views::View,
public NotificationObserver,
public views::TextfieldController {
public:
+ // The internal view class name.
+ static const char kViewClassName[];
+
OmniboxViewViews(AutocompleteEditController* controller,
ToolbarModel* toolbar_model,
Profile* profile,
@@ -70,6 +73,7 @@ class OmniboxViewViews : public views::View,
// Implements views::View
virtual void Layout() OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+ virtual std::string GetClassName() const OVERRIDE;
// OmniboxView:
virtual AutocompleteEditModel* model() OVERRIDE;
diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc
index da60cd1..0670d63 100644
--- a/chrome/browser/ui/views/reload_button.cc
+++ b/chrome/browser/ui/views/reload_button.cc
@@ -13,6 +13,9 @@
#include "ui/base/l10n/l10n_util.h"
#include "views/metrics.h"
+// static
+const char ReloadButton::kViewClassName[] = "browser/ui/views/ReloadButton";
+
////////////////////////////////////////////////////////////////////////////////
// ReloadButton, public:
@@ -128,6 +131,10 @@ bool ReloadButton::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
return true;
}
+std::string ReloadButton::GetClassName() const {
+ return kViewClassName;
+}
+
////////////////////////////////////////////////////////////////////////////////
// ReloadButton, private:
diff --git a/chrome/browser/ui/views/reload_button.h b/chrome/browser/ui/views/reload_button.h
index 3183673ed..e7cd856 100644
--- a/chrome/browser/ui/views/reload_button.h
+++ b/chrome/browser/ui/views/reload_button.h
@@ -30,6 +30,9 @@ class ReloadButton : public views::ToggleImageButton,
public:
enum Mode { MODE_RELOAD = 0, MODE_STOP };
+ // The button's class name.
+ static const char kViewClassName[];
+
ReloadButton(LocationBarView* location_bar, Browser* Browser);
virtual ~ReloadButton();
@@ -45,6 +48,7 @@ class ReloadButton : public views::ToggleImageButton,
virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
virtual bool GetTooltipText(const gfx::Point& p,
std::wstring* tooltip) OVERRIDE;
+ virtual std::string GetClassName() const OVERRIDE;
private:
friend class ReloadButtonTest;
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 3bbf2a5..281993e 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -42,6 +42,8 @@
#include "chrome/browser/enumerate_modules_model_win.h"
#endif
+// static
+char ToolbarView::kViewClassName[] = "browser/ui/views/ToolbarView";
// The space between items is 4 px in general.
const int ToolbarView::kStandardSpacing = 4;
// The top of the toolbar has an edge we have to skip over in addition to the 4
@@ -596,6 +598,10 @@ void ToolbarView::OnThemeChanged() {
LoadImages();
}
+std::string ToolbarView::GetClassName() const {
+ return kViewClassName;
+}
+
////////////////////////////////////////////////////////////////////////////////
// ToolbarView, protected:
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index 6223271..ad5842c 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -39,6 +39,9 @@ class ToolbarView : public AccessiblePaneView,
public CommandUpdater::CommandObserver,
public views::ButtonListener {
public:
+ // The view class name.
+ static char kViewClassName[];
+
explicit ToolbarView(Browser* browser);
virtual ~ToolbarView();
@@ -126,6 +129,7 @@ class ToolbarView : public AccessiblePaneView,
virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE;
virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
virtual void OnThemeChanged() OVERRIDE;
+ virtual std::string GetClassName() const OVERRIDE;
// The apparent horizontal space between most items, and the vertical padding
// above and below them.