Commit bda2b345 authored by Jake Gealer's avatar Jake Gealer
Browse files

Bug 1557835 - Allow migration from Brave r=fluent-reviewers,Gijs 

Differential Revision: https://phabricator.services.mozilla.com/D131731
parent 43e7482f

browser/components/migration/ChromeMigrationUtils.jsm

+3 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ var ChromeMigrationUtils = { 
  getDataPath(chromeProjectName = "Chrome") {

    const SUB_DIRECTORIES = {

      win: {

        Brave: ["BraveSoftware", "Brave-Browser"],

        Chrome: ["Google", "Chrome"],

        "Chrome Beta": ["Google", "Chrome Beta"],

        Chromium: ["Chromium"],
@@ -266,6 +267,7 @@ var ChromeMigrationUtils = { 
        "Edge Beta": ["Microsoft", "Edge Beta"],

      },

      macosx: {

        Brave: ["BraveSoftware", "Brave-Browser"],

        Chrome: ["Google", "Chrome"],

        Chromium: ["Chromium"],

        Canary: ["Google", "Chrome Canary"],
@@ -273,6 +275,7 @@ var ChromeMigrationUtils = { 
        "Edge Beta": ["Microsoft Edge Beta"],

      },

      linux: {

        Brave: ["BraveSoftware", "Brave-Browser"],

        Chrome: ["google-chrome"],

        "Chrome Beta": ["google-chrome-beta"],

        "Chrome Dev": ["google-chrome-unstable"],

browser/components/migration/ChromeProfileMigrator.jsm

+18 −1
Original line number Diff line number Diff line
@@ -623,7 +623,11 @@ ChromiumProfileMigrator.prototype.classID = Components.ID( 
  "{8cece922-9720-42de-b7db-7cef88cb07ca}"

);



var EXPORTED_SYMBOLS = ["ChromeProfileMigrator", "ChromiumProfileMigrator"];

var EXPORTED_SYMBOLS = [

  "ChromeProfileMigrator",

  "ChromiumProfileMigrator",

  "BraveProfileMigrator",

];



/**

 * Chrome Canary
@@ -680,6 +684,19 @@ if (AppConstants.platform != "macosx") { 
  EXPORTED_SYMBOLS.push("ChromeBetaMigrator");

}



function BraveProfileMigrator() {

  this._chromeUserDataPathSuffix = "Brave";

  this._keychainServiceName = "Brave Browser Safe Storage";

  this._keychainAccountName = "Brave Browser";

}

BraveProfileMigrator.prototype = Object.create(ChromeProfileMigrator.prototype);

BraveProfileMigrator.prototype.classDescription = "Brave Browser Migrator";

BraveProfileMigrator.prototype.contractID =

  "@mozilla.org/profile/migrator;1?app=browser&type=brave";

BraveProfileMigrator.prototype.classID = Components.ID(

  "{4071880a-69e4-4c83-88b4-6c589a62801d}"

);



function ChromiumEdgeMigrator() {

  this._chromeUserDataPathSuffix = "Edge";

  this._keychainServiceName = "Microsoft Edge Safe Storage";

browser/components/migration/MigrationUtils.jsm

+13 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ XPCOMUtils.defineLazyGetter(this, "gAvailableMigratorKeys", function() { 
      "firefox",

      "edge",

      "ie",

      "brave",

      "chrome",

      "chromium-edge",

      "chromium-edge-beta",
@@ -91,6 +92,7 @@ XPCOMUtils.defineLazyGetter(this, "gAvailableMigratorKeys", function() { 
    return [

      "firefox",

      "safari",

      "brave",

      "chrome",

      "chromium-edge",

      "chromium-edge-beta",
@@ -99,7 +101,14 @@ XPCOMUtils.defineLazyGetter(this, "gAvailableMigratorKeys", function() { 
    ];

  }

  if (AppConstants.XP_UNIX) {

    return ["firefox", "chrome", "chrome-beta", "chrome-dev", "chromium"];

    return [

      "firefox",

      "brave",

      "chrome",

      "chrome-beta",

      "chrome-dev",

      "chromium",

    ];

  }

  return [];

});
@@ -763,6 +772,8 @@ var MigrationUtils = Object.seal({ 
      Safari: "safari",

      Firefox: "firefox",

      Nightly: "firefox",

      "Brave Web Browser": "brave", // Windows, Linux

      Brave: "brave", // OS X

      "Google Chrome": "chrome", // Windows, Linux

      Chrome: "chrome", // OS X

      Chromium: "chromium", // Windows, OS X
@@ -1257,6 +1268,7 @@ var MigrationUtils = Object.seal({ 
    "360se": 9,

    "chromium-edge": 10,

    "chromium-edge-beta": 10,

    brave: 11,

  },

  getSourceIdForTelemetry(sourceName) {

    return this._sourceNameToIdMapping[sourceName] || 0;

browser/components/migration/components.conf

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ Classes = [ 
        'jsm': 'resource:///modules/ProfileMigrator.jsm',

        'constructor': 'ProfileMigrator',

    },

    {

        'cid': '{4071880a-69e4-4c83-88b4-6c589a62801d}',

        'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=brave'],

        'jsm': 'resource:///modules/ChromeProfileMigrator.jsm',

        'constructor': 'BraveProfileMigrator',

    },

    {

        'cid': '{4cec1de4-1671-4fc3-a53e-6c539dc77a26}',

        'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=chrome'],

browser/components/migration/content/migration.xhtml

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
      <radio id="edge" data-l10n-id="import-from-edge-legacy" />

      <radio id="chromium-edge-beta"      data-l10n-id="import-from-edge-beta"/>

      <radio id="ie"        data-l10n-id="import-from-ie"/>

      <radio id="brave"     data-l10n-id="import-from-brave"/>

      <radio id="chrome"    data-l10n-id="import-from-chrome"/>

      <radio id="chrome-beta"  data-l10n-id="import-from-chrome-beta"/>

      <radio id="chromium"  data-l10n-id="import-from-chromium"/>
@@ -44,12 +45,14 @@ 
      <radio id="360se"     data-l10n-id="import-from-360se"/>

#elifdef XP_MACOSX

      <radio id="safari"    data-l10n-id="import-from-safari"/>

      <radio id="brave"     data-l10n-id="import-from-brave"/>

      <radio id="chrome"    data-l10n-id="import-from-chrome"/>

      <radio id="chromium-edge"      data-l10n-id="import-from-edge"/>

      <radio id="chromium-edge-beta"      data-l10n-id="import-from-edge-beta"/>

      <radio id="chromium"  data-l10n-id="import-from-chromium"/>

      <radio id="canary"    data-l10n-id="import-from-canary"/>

#elifdef XP_UNIX

      <radio id="brave"     data-l10n-id="import-from-brave"/>

      <radio id="chrome"    data-l10n-id="import-from-chrome"/>

      <radio id="chrome-beta"  data-l10n-id="import-from-chrome-beta"/>

      <radio id="chrome-dev"  data-l10n-id="import-from-chrome-dev"/>