Implement support for importing favorites from Edge on Windows 10.

chrome/browser/importer/importer_list.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/importer_list.h"
 
 #include "base/bind.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/importer/firefox_importer_utils.h"
 #include "chrome/common/importer/importer_bridge.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/mac/foundation_util.h"
 #include "chrome/common/importer/safari_importer_utils.h"
 #endif
 
+#if defined(OS_WIN)
+#include "chrome/common/importer/edge_importer_utils_win.h"
+#endif
+
 using content::BrowserThread;
 
 namespace {
 
 #if defined(OS_WIN)
 void DetectIEProfiles(std::vector<importer::SourceProfile*>* profiles) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   // IE always exists and doesn't have multiple profiles.

[Ilya Sherman, 2015/11/26 02:04:43]

Is it still true that IE always exists on Windows 10?

[forshaw, 2015/11/30 12:57:57]

Yes it's still there, things like the favorites are actually baked into the
Explorer shell so even if you remove the IE GUI you still have IE installed in a
sense.

   importer::SourceProfile* ie = new importer::SourceProfile;
   ie->importer_name = l10n_util::GetStringUTF16(IDS_IMPORT_FROM_IE);
   ie->importer_type = importer::TYPE_IE;
   ie->source_path.clear();
   ie->app_path.clear();
   ie->services_supported = importer::HISTORY | importer::FAVORITES |
       importer::COOKIES | importer::PASSWORDS | importer::SEARCH_ENGINES;
   profiles->push_back(ie);
 }
+
+void DetectEdgeProfiles(std::vector<importer::SourceProfile*>* profiles) {
+  importer::SourceProfile* edge = new importer::SourceProfile;

[Ilya Sherman, 2015/11/26 02:04:43]

Hrm.  Not as part of this CL, but if you have time, it would be really nice to
clean up the memory model here, so that we're not passing around
implicitly-owned pointers.

[forshaw, 2015/11/30 12:57:57]

Will look at it, does seem pretty nasty.

+  edge->importer_name = l10n_util::GetStringUTF16(IDS_IMPORT_FROM_EDGE);
+  edge->importer_type = importer::TYPE_EDGE;
+  edge->source_path.clear();
+  edge->app_path.clear();

[Ilya Sherman, 2015/11/26 02:04:43]

These two lines don't do anything -- right?  I do see that they're also present
in the DetectIEProfiles implementation above, but it seems pretty weird to
include them.

[forshaw, 2015/11/30 12:57:57]

Nope probably not, just copied again from above.

+  edge->services_supported = importer::FAVORITES;
+  profiles->push_back(edge);
+}
+
+void DetectBuiltinWindowsProfiles(
+    std::vector<importer::SourceProfile*>* profiles) {
+  // Make the assumption on Windows 10 that Edge exists and is probably default.
+  if (importer::EdgeImporterCanImport())
+    DetectEdgeProfiles(profiles);
+  DetectIEProfiles(profiles);
+}
+
 #endif  // defined(OS_WIN)
 
 #if defined(OS_MACOSX)
 void DetectSafariProfiles(std::vector<importer::SourceProfile*>* profiles) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   uint16 items = importer::NONE;
   if (!SafariImporterCanImport(base::mac::GetUserLibraryPath(), &items))
     return;
 
   importer::SourceProfile* safari = new importer::SourceProfile;
@@ skipping 54 matching lines @@
     bool include_interactive_profiles) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   std::vector<importer::SourceProfile*> profiles;
 
   // The first run import will automatically take settings from the first
   // profile detected, which should be the user's current default.
 #if defined(OS_WIN)
   if (ShellIntegration::IsFirefoxDefaultBrowser()) {
     DetectFirefoxProfiles(locale, &profiles);
-    DetectIEProfiles(&profiles);
+    DetectBuiltinWindowsProfiles(&profiles);
   } else {
-    DetectIEProfiles(&profiles);
+    DetectBuiltinWindowsProfiles(&profiles);
     DetectFirefoxProfiles(locale, &profiles);
   }
 #elif defined(OS_MACOSX)
   if (ShellIntegration::IsFirefoxDefaultBrowser()) {
     DetectFirefoxProfiles(locale, &profiles);
     DetectSafariProfiles(&profiles);
   } else {
     DetectSafariProfiles(&profiles);
     DetectFirefoxProfiles(locale, &profiles);
   }
@@ skipping 46 matching lines @@
 }
 
 void ImporterList::SourceProfilesLoaded(
     const base::Closure& profiles_loaded_callback,
     const std::vector<importer::SourceProfile*>& profiles) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   source_profiles_.assign(profiles.begin(), profiles.end());
   profiles_loaded_callback.Run();
 }