| Index: chrome/browser/google_apis/drive_api_operations.h
|
| diff --git a/chrome/browser/google_apis/drive_api_operations.h b/chrome/browser/google_apis/drive_api_operations.h
|
| index 514f7be59828ad8359d654f7d8e3de00a926d3bc..21164701609521b17835a38bd240a3d768359e10 100644
|
| --- a/chrome/browser/google_apis/drive_api_operations.h
|
| +++ b/chrome/browser/google_apis/drive_api_operations.h
|
| @@ -138,7 +138,7 @@ class GetFileOperation : public GetDataOperation {
|
| DISALLOW_COPY_AND_ASSIGN(GetFileOperation);
|
| };
|
|
|
| -// This namespace is introduced to avoid class name confliction between
|
| +// This namespace is introduced to avoid class name conflict between
|
| // the operations for Drive API v2 and GData WAPI for transition.
|
| // And, when the migration is done and GData WAPI's code is cleaned up,
|
| // classes inside this namespace should be moved to the google_apis namespace.
|
| @@ -279,7 +279,7 @@ class InsertResourceOperation : public EntryActionOperation {
|
| // This class performs the operation for removing a resource from a directory.
|
| // Note that we use "delete" for the name of this class, which comes from the
|
| // operation name of the Drive API v2, although we prefer "remove" for that
|
| -// sence in "drive/google_api"
|
| +// sense in "drive/google_api"
|
| // Also note that this is the operation of "Children: delete" of the Drive API
|
| // v2. https://developers.google.com/drive/v2/reference/children/delete
|
| class DeleteResourceOperation : public EntryActionOperation {
|
|
|