فهرست منبع

fix trailing whitespace

Carmelo Messina 3 سال پیش
والد
کامیت
54ac6a94e2

+ 3 - 3
build/patches/Add-bookmark-import-export-actions.patch

@@ -446,8 +446,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +                        // get real actual file name on disk
 +                        // get real actual file name on disk
 +                        if (actualFilePath==null) actualFilePath = lastSelectedUri.toString();
 +                        if (actualFilePath==null) actualFilePath = lastSelectedUri.toString();
 +                        // set file name to last exported file name
 +                        // set file name to last exported file name
-+                        fileSelector.putExtra(Intent.EXTRA_TITLE, 
-+                            ContentUriUtils.getDisplayName(lastSelectedUri, context, 
++                        fileSelector.putExtra(Intent.EXTRA_TITLE,
++                            ContentUriUtils.getDisplayName(lastSelectedUri, context,
 +                                DocumentsContract.Document.COLUMN_DISPLAY_NAME));
 +                                DocumentsContract.Document.COLUMN_DISPLAY_NAME));
 +                    }
 +                    }
 +                    return null;
 +                    return null;
@@ -504,7 +504,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        DownloadLocationDialogController controller = new DownloadLocationDialogController() {
 +        DownloadLocationDialogController controller = new DownloadLocationDialogController() {
 +            @Override
 +            @Override
 +            public void onDownloadLocationDialogComplete(String returnedPath) {}
 +            public void onDownloadLocationDialogComplete(String returnedPath) {}
-+            
++
 +            @Override
 +            @Override
 +            public void onDownloadLocationDialogCanceled() {}
 +            public void onDownloadLocationDialogCanceled() {}
 +        };
 +        };

+ 1 - 1
build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch

@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 +            mMostVisitedSites =
 +            mMostVisitedSites =
 +                SuggestionsDependencyFactory.getInstance().createMostVisitedSites(Profile.getLastUsedRegularProfile());
 +                SuggestionsDependencyFactory.getInstance().createMostVisitedSites(Profile.getLastUsedRegularProfile());
 +        }
 +        }
-+        mMostVisitedSites.removeBlocklistedUrl(tabToBookmark.getOriginalUrl());	
++        mMostVisitedSites.removeBlocklistedUrl(tabToBookmark.getOriginalUrl());
 +
 +
          if (bridge == null || !bridge.isEditBookmarksEnabled()) {
          if (bridge == null || !bridge.isEditBookmarksEnabled()) {
              assert false;
              assert false;