summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-21 00:57:15 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-21 00:57:15 +0000
commit594939c1d487af24284c9e27f37db06268d119b7 (patch)
tree953ddeda221dce8113dde25792c96db74aba79d1 /views
parentadc442cbbbc157fe3aee254bc53e87ac133b80ff (diff)
downloadchromium_src-594939c1d487af24284c9e27f37db06268d119b7.zip
chromium_src-594939c1d487af24284c9e27f37db06268d119b7.tar.gz
chromium_src-594939c1d487af24284c9e27f37db06268d119b7.tar.bz2
views: Rename child_widget() to GetChildWidget().
This is a virtual method, so it shouldn't use the unix_hacker style. Note: This was a TODO for ben. BUG=None TEST=None R=ben@chromium.org Review URL: http://codereview.chromium.org/7056027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/accessibility/native_view_accessibility_win.cc4
-rw-r--r--views/controls/tabbed_pane/native_tabbed_pane_win.cc4
-rw-r--r--views/controls/tabbed_pane/native_tabbed_pane_win.h6
-rw-r--r--views/view.cc2
-rw-r--r--views/view.h4
5 files changed, 10 insertions, 10 deletions
diff --git a/views/accessibility/native_view_accessibility_win.cc b/views/accessibility/native_view_accessibility_win.cc
index 029a0dc..6796afe 100644
--- a/views/accessibility/native_view_accessibility_win.cc
+++ b/views/accessibility/native_view_accessibility_win.cc
@@ -42,9 +42,9 @@ IAccessible* NativeViewAccessibilityWin::GetAccessibleForView(
}
// Next, see if the view is a widget container.
- if (view->child_widget()) {
+ if (view->GetChildWidget()) {
views::NativeWidgetWin* native_widget =
- reinterpret_cast<views::NativeWidgetWin*>(view->child_widget());
+ reinterpret_cast<views::NativeWidgetWin*>(view->GetChildWidget());
if (GetNativeIAccessibleInterface(
native_widget->GetNativeView(), &accessible) == S_OK) {
return accessible;
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index 4933538..00f0315 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -364,6 +364,10 @@ void NativeTabbedPaneWin::ViewHierarchyChanged(bool is_add,
}
}
+Widget* NativeTabbedPaneWin::GetChildWidget() {
+ return content_window_;
+}
+
////////////////////////////////////////////////////////////////////////////////
// NativeTabbedPaneWin, private:
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.h b/views/controls/tabbed_pane/native_tabbed_pane_win.h
index 6ffa867..4fb2a2e 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.h
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
@@ -49,9 +49,7 @@ class NativeTabbedPaneWin : public NativeControlWin,
virtual void Layout();
virtual FocusTraversable* GetFocusTraversable();
virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child);
-
- // TODO(beng): this method should not be unix_hacker
- virtual Widget* child_widget() { return content_window_; }
+ virtual Widget* GetChildWidget();
private:
// Called upon creation of native control to initialize tabs that are added
diff --git a/views/view.cc b/views/view.cc
index cf6a790..3b409b6 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -87,7 +87,7 @@ bool View::IsHotTracked() const {
// FATE TBD --------------------------------------------------------------------
-Widget* View::child_widget() {
+Widget* View::GetChildWidget() {
return NULL;
}
diff --git a/views/view.h b/views/view.h
index 984f50b..a8dd6c9 100644
--- a/views/view.h
+++ b/views/view.h
@@ -175,9 +175,7 @@ class View : public AcceleratorTarget {
// FATE TBD ------------------------------------------------------------------
// TODO(beng): Figure out what these methods are for and delete them.
-
- // TODO(beng): this one isn't even google3-style. wth.
- virtual Widget* child_widget();
+ virtual Widget* GetChildWidget();
// Creation and lifetime -----------------------------------------------------