OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/gdata/gdata_file_system.h" | 5 #include "chrome/browser/chromeos/gdata/gdata_file_system.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
908 true, /* should_fetch_multiple_feeds */ | 908 true, /* should_fetch_multiple_feeds */ |
909 search_file_path, | 909 search_file_path, |
910 std::string() /* no search query */, | 910 std::string() /* no search query */, |
911 std::string() /* no directory resource ID */, | 911 std::string() /* no directory resource ID */, |
912 callback, | 912 callback, |
913 base::Bind(&GDataFileSystem::OnFeedFromServerLoaded, | 913 base::Bind(&GDataFileSystem::OnFeedFromServerLoaded, |
914 ui_weak_ptr_)); | 914 ui_weak_ptr_)); |
915 return; | 915 return; |
916 } | 916 } |
917 | 917 |
918 webapps_registry_->UpdateFromFeed(account_metadata.get()); | 918 if (!gdata::util::IsDriveV2ApiEnabled()) |
satorux1
2012/07/12 07:49:06
does this mean the webapps registry does not work
kochi
2012/07/13 10:33:52
I intend to separate a new DriveFileSystem class a
satorux1
2012/07/14 07:15:34
DriveFileSystem will likely share a lot of code wi
| |
919 webapps_registry_->UpdateFromFeed(account_metadata.get()); | |
919 | 920 |
920 bool changes_detected = true; | 921 bool changes_detected = true; |
921 if (local_changestamp >= account_metadata->largest_changestamp()) { | 922 if (local_changestamp >= account_metadata->largest_changestamp()) { |
922 if (local_changestamp > account_metadata->largest_changestamp()) { | 923 if (local_changestamp > account_metadata->largest_changestamp()) { |
923 LOG(WARNING) << "Cached client feed is fresher than server, client = " | 924 LOG(WARNING) << "Cached client feed is fresher than server, client = " |
924 << local_changestamp | 925 << local_changestamp |
925 << ", server = " | 926 << ", server = " |
926 << account_metadata->largest_changestamp(); | 927 << account_metadata->largest_changestamp(); |
927 } | 928 } |
928 root_->set_origin(initial_origin); | 929 root_->set_origin(initial_origin); |
(...skipping 2991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3920 // must go through here. Removes the |file_path| from the remembered set so | 3921 // must go through here. Removes the |file_path| from the remembered set so |
3921 // that subsequent operations can open the file again. | 3922 // that subsequent operations can open the file again. |
3922 open_files_.erase(file_path); | 3923 open_files_.erase(file_path); |
3923 | 3924 |
3924 // Then invokes the user-supplied callback function. | 3925 // Then invokes the user-supplied callback function. |
3925 if (!callback.is_null()) | 3926 if (!callback.is_null()) |
3926 callback.Run(result); | 3927 callback.Run(result); |
3927 } | 3928 } |
3928 | 3929 |
3929 } // namespace gdata | 3930 } // namespace gdata |
OLD | NEW |