Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Unified Diff: ios/chrome/browser/snapshots/snapshots_util.mm

Issue 2426823002: Removed use of IsRunningOnIOS8OrLater from snapshots code. (Closed)
Patch Set: addressed comments from sdefresne Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/snapshots/snapshots_util.mm
diff --git a/ios/chrome/browser/snapshots/snapshots_util.mm b/ios/chrome/browser/snapshots/snapshots_util.mm
index bb34a6d2f9169e32f67362cca5e29eae5d11b3ed..8ab62fef700426ff8f2ec95f98ffa4dbf309364e 100644
--- a/ios/chrome/browser/snapshots/snapshots_util.mm
+++ b/ios/chrome/browser/snapshots/snapshots_util.mm
@@ -40,16 +40,10 @@ void GetSnapshotsPaths(std::vector<base::FilePath>* snapshotsPaths) {
DCHECK(snapshotsPaths);
base::FilePath snapshotsDir;
PathService::Get(base::DIR_CACHE, &snapshotsDir);
- snapshotsDir =
- snapshotsDir.Append("Snapshots").Append(base::mac::BaseBundleID());
- if (base::ios::IsRunningOnIOS8OrLater()) {
- // On iOS8, the snapshots are located in a path with the bundle ID used
- // twice.
- snapshotsDir = snapshotsDir.Append(base::mac::BaseBundleID());
- } else {
- // On iOS7, the snapshots are located in the subfolder "Main".
- snapshotsDir = snapshotsDir.Append("Main");
- }
+ // Snapshots are located in a path with the bundle ID used twice.
+ snapshotsDir = snapshotsDir.Append("Snapshots")
+ .Append(base::mac::BaseBundleID())
+ .Append(base::mac::BaseBundleID());
const char* retinaSuffix = "";
CGFloat scale = [UIScreen mainScreen].scale;
if (scale == 2) {
« no previous file with comments | « ios/chrome/browser/snapshots/snapshot_cache_unittest.mm ('k') | ios/chrome/browser/snapshots/snapshots_util_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698