summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorgavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 12:32:14 +0000
committergavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-03 12:32:14 +0000
commita2c92a1c2ec5dac7671b0bf100fe1f3b27c71f8e (patch)
treef3787c1f22d263aa533cbe0f094440da1349e2bf /ui
parent6a19b257d4d6f9b98f754af68cd630242b3c8782 (diff)
downloadchromium_src-a2c92a1c2ec5dac7671b0bf100fe1f3b27c71f8e.zip
chromium_src-a2c92a1c2ec5dac7671b0bf100fe1f3b27c71f8e.tar.gz
chromium_src-a2c92a1c2ec5dac7671b0bf100fe1f3b27c71f8e.tar.bz2
Fix some grammar in comments, error messages and documentation.
Thanks to all my reviewers, you are legion. I hope I didn't waste too much of your time. BUG=None Review URL: http://codereview.chromium.org/9854039 Review URL: http://codereview.chromium.org/9854043 Review URL: http://codereview.chromium.org/9863058 Review URL: http://codereview.chromium.org/9863059 Review URL: http://codereview.chromium.org/9887005 Review URL: http://codereview.chromium.org/9890002 Review URL: http://codereview.chromium.org/9891002 Review URL: http://codereview.chromium.org/9895003 Review URL: http://codereview.chromium.org/9896002 Review URL: http://codereview.chromium.org/9896003 Review URL: http://codereview.chromium.org/9897002 Review URL: http://codereview.chromium.org/9897003 Review URL: http://codereview.chromium.org/9903004 Review URL: http://codereview.chromium.org/9904003 Review URL: http://codereview.chromium.org/9904002 Review URL: http://codereview.chromium.org/9904004 Review URL: http://codereview.chromium.org/9906002 Review URL: http://codereview.chromium.org/9906001 Review URL: http://codereview.chromium.org/9906003 Review URL: http://codereview.chromium.org/9909001 Review URL: http://codereview.chromium.org/9909002 Review URL: http://codereview.chromium.org/9909003 Review URL: http://codereview.chromium.org/9909004 Review URL: http://codereview.chromium.org/9910001 Review URL: http://codereview.chromium.org/9910002 Review URL: http://codereview.chromium.org/9910010 Review URL: http://codereview.chromium.org/9911001 Review URL: http://codereview.chromium.org/9912001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/aura/root_window.cc2
-rw-r--r--ui/views/controls/tree/tree_view_views.cc2
-rw-r--r--ui/views/controls/tree/tree_view_views.h4
-rw-r--r--ui/views/controls/tree/tree_view_views_unittest.cc2
-rw-r--r--ui/views/layout/grid_layout.cc4
-rw-r--r--ui/views/widget/tooltip_manager_win.cc2
-rw-r--r--ui/views/widget/widget.h2
-rw-r--r--ui/views/window/dialog_delegate.h2
8 files changed, 10 insertions, 10 deletions
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 5dc7f60..3657af3 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -866,7 +866,7 @@ void RootWindow::SynthesizeMouseMoveEvent() {
layer()->transform().TransformPoint(orig_mouse_location);
// TODO(derat|oshima): Don't use mouse_button_flags_ as it's
- // is currently broken. See/ crbug.com/107931.
+ // currently broken. See/ crbug.com/107931.
MouseEvent event(ui::ET_MOUSE_MOVED,
orig_mouse_location,
orig_mouse_location,
diff --git a/ui/views/controls/tree/tree_view_views.cc b/ui/views/controls/tree/tree_view_views.cc
index 4234676..92a6c2b 100644
--- a/ui/views/controls/tree/tree_view_views.cc
+++ b/ui/views/controls/tree/tree_view_views.cc
@@ -391,7 +391,7 @@ void TreeView::TreeNodesRemoved(TreeModel* model,
}
if (reset_selection) {
// selected_node_ is no longer valid (at the time we enter this function
- // it's model_node() is likely deleted). Explicitly NULL out the field
+ // its model_node() is likely deleted). Explicitly NULL out the field
// rather than invoking SetSelectedNode() otherwise, we'll try and use a
// deleted value.
selected_node_ = NULL;
diff --git a/ui/views/controls/tree/tree_view_views.h b/ui/views/controls/tree/tree_view_views.h
index e97fcd6..f2ec5ce 100644
--- a/ui/views/controls/tree/tree_view_views.h
+++ b/ui/views/controls/tree/tree_view_views.h
@@ -81,7 +81,7 @@ class VIEWS_EXPORT TreeView : public View,
ui::TreeModelNode* GetSelectedNode();
// Marks |model_node| as collapsed. This only effects the UI if node and all
- // it's parents are expanded (IsExpanded(model_node) returns true).
+ // its parents are expanded (IsExpanded(model_node) returns true).
void Collapse(ui::TreeModelNode* model_node);
// Make sure node and all its parents are expanded.
@@ -178,7 +178,7 @@ class VIEWS_EXPORT TreeView : public View,
// Returns the max width of all descendants (including this node). |indent|
// is how many pixels each child is indented and |depth| is the depth of
- // this node from it's parent.
+ // this node from its parent.
int GetMaxWidth(int indent, int depth);
private:
diff --git a/ui/views/controls/tree/tree_view_views_unittest.cc b/ui/views/controls/tree/tree_view_views_unittest.cc
index b845ce8..43e3e15 100644
--- a/ui/views/controls/tree/tree_view_views_unittest.cc
+++ b/ui/views/controls/tree/tree_view_views_unittest.cc
@@ -242,7 +242,7 @@ TEST_F(TreeViewViewsTest, TreeNodesRemoved) {
EXPECT_EQ("root", GetSelectedNodeTitle());
EXPECT_EQ(4, GetRowCount());
- // Expand b1, then collapse it and remove it's only child, b1. This shouldn't
+ // Expand b1, then collapse it and remove its only child, b1. This shouldn't
// effect the tree.
tree_.Expand(GetNodeByTitle("b"));
tree_.Collapse(GetNodeByTitle("b"));
diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc
index b11bcbf..88b33f9 100644
--- a/ui/views/layout/grid_layout.cc
+++ b/ui/views/layout/grid_layout.cc
@@ -899,8 +899,8 @@ void GridLayout::SizeRowsAndColumns(bool layout, int width, int height,
view_state->col_span);
if (actual_width != view_state->pref_width &&
!view_state->pref_height_fixed) {
- // The width this view will get differs from it's preferred. Some Views
- // pref height varies with it's width; ask for the preferred again.
+ // The width this view will get differs from its preferred. Some Views
+ // pref height varies with its width; ask for the preferred again.
view_state->pref_height =
view_state->view->GetHeightForWidth(actual_width);
view_state->remaining_height = view_state->pref_height;
diff --git a/ui/views/widget/tooltip_manager_win.cc b/ui/views/widget/tooltip_manager_win.cc
index f03d858..df2d294 100644
--- a/ui/views/widget/tooltip_manager_win.cc
+++ b/ui/views/widget/tooltip_manager_win.cc
@@ -243,7 +243,7 @@ bool TooltipManagerWin::SetTooltipPosition(int text_x, int text_y) {
}
int TooltipManagerWin::CalcTooltipHeight() {
- // Ask the tooltip for it's font.
+ // Ask the tooltip for its font.
int height;
HFONT hfont = reinterpret_cast<HFONT>(
SendMessage(tooltip_hwnd_, WM_GETFONT, 0, 0));
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index ef3fdcf..86201ff 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -146,7 +146,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
InitParams();
explicit InitParams(Type type);
- // If |parent_widget| is non-null, it's native view is returned, otherwise
+ // If |parent_widget| is non-null, its native view is returned, otherwise
// |parent| is returned.
gfx::NativeView GetParent() const;
diff --git a/ui/views/window/dialog_delegate.h b/ui/views/window/dialog_delegate.h
index 4ab4cd3..28af328 100644
--- a/ui/views/window/dialog_delegate.h
+++ b/ui/views/window/dialog_delegate.h
@@ -68,7 +68,7 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
virtual View* GetExtraView();
// Returns whether the height of the extra view should be at least as tall as
- // the buttons. The default (false) is to give the extra view it's preferred
+ // the buttons. The default (false) is to give the extra view its preferred
// height. By returning true the height becomes
// max(extra_view preferred height, buttons preferred height).
virtual bool GetSizeExtraViewHeightToButtons();