diff options
-rw-r--r-- | chrome/browser/autofill/autofill_dialog_controller_mac.mm | 4 | ||||
-rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 2 | ||||
-rw-r--r-- | chrome/browser/views/generic_info_view.cc | 2 | ||||
-rw-r--r-- | media/base/callback.h | 2 | ||||
-rw-r--r-- | o3d/samples/manipulators/manipsample.js | 2 | ||||
-rw-r--r-- | o3d/samples/primitives.html | 2 | ||||
-rw-r--r-- | o3d/samples/vertex-shader.html | 4 | ||||
-rw-r--r-- | o3d/tests/selenium/tests/pixel-perfection.html | 2 | ||||
-rw-r--r-- | tools/code_coverage/process_coverage.py | 2 | ||||
-rwxr-xr-x | tools/xcodebodge/xcodebodge.py | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.mm b/chrome/browser/autofill/autofill_dialog_controller_mac.mm index f9a8155..775274f 100644 --- a/chrome/browser/autofill/autofill_dialog_controller_mac.mm +++ b/chrome/browser/autofill/autofill_dialog_controller_mac.mm @@ -97,7 +97,7 @@ } // Adds new address to bottom of list. A new address controller is created -// and its view is inserted into the view heirarchy. +// and its view is inserted into the view hierarchy. - (IBAction)addNewAddress:(id)sender { // Insert relative to top of section, or below last address. NSView* insertionPoint; @@ -132,7 +132,7 @@ } // Adds new credit card to bottom of list. A new credit card controller is -// created and its view is inserted into the view heirarchy. +// created and its view is inserted into the view hierarchy. - (IBAction)addNewCreditCard:(id)sender { // Insert relative to top of section, or below last address. NSView* insertionPoint; diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index 242e441..f2af366 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -60,7 +60,7 @@ std::string GetNewTabUIURLString() { return URLFixerUpper::FixupURL(chrome::kChromeUINewTabURL, std::string()); } -// Helper to remove all but the last view from the view heirarchy. +// Helper to remove all but the last view from the view hierarchy. void RemoveAllButLastView(NSArray* views) { NSArray* toRemove = [views subarrayWithRange:NSMakeRange(0, [views count]-1)]; for (NSView* view in toRemove) { diff --git a/chrome/browser/views/generic_info_view.cc b/chrome/browser/views/generic_info_view.cc index edd8492..81ebb4a 100644 --- a/chrome/browser/views/generic_info_view.cc +++ b/chrome/browser/views/generic_info_view.cc @@ -98,7 +98,7 @@ void GenericInfoView::AddRow( // Color these borderless text areas the same as the containing dialog. SkColor text_area_background = color_utils::GetSysSkColor(COLOR_3DFACE); - // Init them now that they're in the view heirarchy. + // Init them now that they're in the view hierarchy. value->SetReadOnly(true); value->RemoveBorder(); value->SetBackgroundColor(text_area_background); diff --git a/media/base/callback.h b/media/base/callback.h index 0d47e93..cefcae92 100644 --- a/media/base/callback.h +++ b/media/base/callback.h @@ -9,7 +9,7 @@ // executed and delete in the face of multiple return points in a function. // // TaskToCallbackAdapter converts a Task to a Callback0::Type since the two type -// heirarchies are strangely separate. +// hierarchies are strangely separate. // // CleanupCallback wraps another Callback and provides the ability to register // objects for deletion as well as cleanup tasks that will be run on the diff --git a/o3d/samples/manipulators/manipsample.js b/o3d/samples/manipulators/manipsample.js index c788006..a63cf8c 100644 --- a/o3d/samples/manipulators/manipsample.js +++ b/o3d/samples/manipulators/manipsample.js @@ -86,7 +86,7 @@ function main(clientElements) { // Init global variables. initGlobals(clientElements); - // Add the shapes to the transform heirarchy. + // Add the shapes to the transform hierarchy. createShapes(); // Add the manipulators to the transform hierarchy. diff --git a/o3d/samples/primitives.html b/o3d/samples/primitives.html index 27763d1..6c2021e 100644 --- a/o3d/samples/primitives.html +++ b/o3d/samples/primitives.html @@ -84,7 +84,7 @@ function main(clientElements) { // Set up the view and projection transformations. initContext(); - // Add the shapes to the transform heirarchy. + // Add the shapes to the transform hierarchy. createShapes(); window.g_finished = true; // for selenium testing. diff --git a/o3d/samples/vertex-shader.html b/o3d/samples/vertex-shader.html index 8443374..f3f4602 100644 --- a/o3d/samples/vertex-shader.html +++ b/o3d/samples/vertex-shader.html @@ -91,7 +91,7 @@ function initStep2(clientElements) { // Set up the view and projection transformations. initContext(); - // Add the shapes to the transform heirarchy. + // Add the shapes to the transform hierarchy. createPlane(); // Setup render callback. @@ -192,7 +192,7 @@ function createPlane() { var plane = o3djs.primitives.createPlane( g_pack, createMaterial(), 4, 4, 300, 300); - // Add the shape to the transform heirarchy. + // Add the shape to the transform hierarchy. g_client.root.addShape(plane); } diff --git a/o3d/tests/selenium/tests/pixel-perfection.html b/o3d/tests/selenium/tests/pixel-perfection.html index 18ecb1d..a1e84b0 100644 --- a/o3d/tests/selenium/tests/pixel-perfection.html +++ b/o3d/tests/selenium/tests/pixel-perfection.html @@ -96,7 +96,7 @@ function main(clientElements) { // Set up the view and projection transformations. initContext(); - // Add the shapes to the transform heirarchy. + // Add the shapes to the transform hierarchy. createShapes(); window.g_testResult = true; // for selenium testing. diff --git a/tools/code_coverage/process_coverage.py b/tools/code_coverage/process_coverage.py index a1f3c1e..8035974 100644 --- a/tools/code_coverage/process_coverage.py +++ b/tools/code_coverage/process_coverage.py @@ -105,7 +105,7 @@ def GenerateHtml(lcov_path, dash_root): buffer = filename.split('_') dash_root = dash_root.rstrip('/') # Remove trailing '/' - # Set up correct folder heirarchy in the dashboard root + # Set up correct folder hierarchy in the dashboard root # TODO(niranjan): Check the formatting using a regexp if len(buffer) >= 3: # Check if filename has right formatting platform = buffer[len(buffer) - 2] diff --git a/tools/xcodebodge/xcodebodge.py b/tools/xcodebodge/xcodebodge.py index 2907d78..f4beabb9 100755 --- a/tools/xcodebodge/xcodebodge.py +++ b/tools/xcodebodge/xcodebodge.py @@ -512,7 +512,7 @@ class XcodeProject(object): def AddSourceFile(self, path): """Add a source file to the project, attempting to position it - in the GUI group heirarchy reasonably. + in the GUI group hierarchy reasonably. NOTE: Adding a source file does not add it to any targets |