Suppressing First Run bubble when viewing chrome://welcome-win10

chrome/browser/first_run/first_run.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/first_run/first_run.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 324 matching lines @@
   const GURL deprecated_welcome_page(
       l10n_util::GetStringUTF8(IDS_WELCOME_PAGE_URL));
   if (contents->GetURL() == deprecated_welcome_page ||
       (contents->GetController().GetVisibleEntry() &&
        contents->GetController().GetVisibleEntry()->GetOriginalRequestURL() ==
            deprecated_welcome_page)) {
     return true;
   }
 
   const GURL welcome_page(chrome::kChromeUIWelcomeURL);
-  return contents->GetURL().GetWithEmptyPath() == welcome_page;
+  const GURL welcome_page_win10(chrome::kChromeUIWelcomeWin10URL);
+  const GURL current = contents->GetURL().GetWithEmptyPath();
+  return current == welcome_page || current == welcome_page_win10;
 }
 
 // Show the first run search engine bubble at the first appropriate opportunity.
 // This bubble may be delayed by other UI, like global errors and sync promos.
 class FirstRunBubbleLauncher : public content::NotificationObserver {
  public:
   // Show the bubble at the first appropriate opportunity. This function
   // instantiates a FirstRunBubbleLauncher, which manages its own lifetime.
   static void ShowFirstRunBubbleSoon();
 
@@ skipping 501 matching lines @@
   SetShouldDoPersonalDataManagerFirstRun();
 
   internal::DoPostImportPlatformSpecificTasks(profile);
 }
 
 uint16_t auto_import_state() {
   return g_auto_import_state;
 }
 
 }  // namespace first_run