WebUI: move existing welcome backend code to a dedicated folder.

This is to prepare for a following CL to move all the components/nux/
backend code to chrome/browser/ui/webui/welcome/. The decision to move
components/nux/ to  chrome/browser/ui/webui/welcome/ is based on the fact
that nux is only ever going to be used in webui and exclusively within the
welcome flow.

Bug: 874122
Change-Id: I873047c06dc76f14c4d9affb5c3829dc0f4b5e18
Reviewed-on: https://chromium-review.googlesource.com/1229333
Commit-Queue: Scott Chen <scottchen@chromium.org>
Reviewed-by: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594486}

chrome/browser/ui/BUILD.gn

@@ -1951,10 +1951,10 @@ jumbo_split_static_library("ui") {
       "webui/signin/user_manager_screen_handler.h",
       "webui/welcome/nux_helper.cc",
       "webui/welcome/nux_helper.h",
-      "webui/welcome_handler.cc",
-      "webui/welcome_handler.h",
-      "webui/welcome_ui.cc",
-      "webui/welcome_ui.h",
+      "webui/welcome/welcome_handler.cc",
+      "webui/welcome/welcome_handler.h",
+      "webui/welcome/welcome_ui.cc",
+      "webui/welcome/welcome_ui.h",
     ]
 
     if (enable_dice_support) {
@@ -2252,10 +2252,10 @@ jumbo_split_static_library("ui") {
       "webui/settings/chrome_cleanup_handler.cc",
       "webui/settings/chrome_cleanup_handler.h",
       "webui/settings_utils_win.cc",
-      "webui/welcome_win10_handler.cc",
-      "webui/welcome_win10_handler.h",
-      "webui/welcome_win10_ui.cc",
-      "webui/welcome_win10_ui.h",
+      "webui/welcome/welcome_win10_handler.cc",
+      "webui/welcome/welcome_win10_handler.h",
+      "webui/welcome/welcome_win10_ui.cc",
+      "webui/welcome/welcome_win10_ui.h",
     ]
     public_deps += [
       "//ui/views",

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -179,13 +179,13 @@
 #include "chrome/browser/ui/webui/signin/signin_email_confirmation_ui.h"
 #include "chrome/browser/ui/webui/signin/signin_error_ui.h"
 #include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"
-#include "chrome/browser/ui/webui/welcome_ui.h"
+#include "chrome/browser/ui/webui/welcome/welcome_ui.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
 #include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
-#include "chrome/browser/ui/webui/welcome_win10_ui.h"
+#include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h"
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)

chrome/browser/ui/webui/welcome_handler.cc → chrome/browser/ui/webui/welcome/welcome_handler.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/welcome_handler.h"
+#include "chrome/browser/ui/webui/welcome/welcome_handler.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"

chrome/browser/ui/webui/welcome_handler.h → chrome/browser/ui/webui/welcome/welcome_handler.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_WELCOME_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_HANDLER_H_
 
 #include "base/macros.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ -57,4 +57,4 @@ class WelcomeHandler : public content::WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(WelcomeHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_WELCOME_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_HANDLER_H_

chrome/browser/ui/webui/welcome_ui.cc → chrome/browser/ui/webui/welcome/welcome_ui.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/welcome_ui.h"
+#include "chrome/browser/ui/webui/welcome/welcome_ui.h"
 
 #include <memory>
 #include <string>
@@ -11,7 +11,7 @@
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/signin/account_consistency_mode_manager.h"
 #include "chrome/browser/ui/webui/welcome/nux_helper.h"
-#include "chrome/browser/ui/webui/welcome_handler.h"
+#include "chrome/browser/ui/webui/welcome/welcome_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/chrome_unscaled_resources.h"
@@ -34,13 +34,13 @@
 #endif  // defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
 
 namespace {
-  const bool kIsBranded =
+const bool kIsBranded =
 #if defined(GOOGLE_CHROME_BUILD)
-      true;
+    true;
 #else
-      false;
+    false;
 #endif
-}
+}  // namespace
 
 WelcomeUI::WelcomeUI(content::WebUI* web_ui, const GURL& url)
     : content::WebUIController(web_ui) {

chrome/browser/ui/webui/welcome_ui.h → chrome/browser/ui/webui/welcome/welcome_ui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_WELCOME_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_UI_H_
 
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_ui_controller.h"
@@ -22,4 +22,4 @@ class WelcomeUI : public content::WebUIController {
   void StorePageSeen(Profile* profile, const GURL& url);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_WELCOME_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_UI_H_

chrome/browser/ui/webui/welcome_win10_handler.cc → chrome/browser/ui/webui/welcome/welcome_win10_handler.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/welcome_win10_handler.h"
+#include "chrome/browser/ui/webui/welcome/welcome_win10_handler.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram_functions.h"

chrome/browser/ui/webui/welcome_win10_handler.h → chrome/browser/ui/webui/welcome/welcome_win10_handler.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_WIN10_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_WELCOME_WIN10_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_WIN10_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_WIN10_HANDLER_H_
 
 #include <string>
 
@@ -64,4 +64,4 @@ class WelcomeWin10Handler : public content::WebUIMessageHandler {
   DISALLOW_COPY_AND_ASSIGN(WelcomeWin10Handler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_WELCOME_WIN10_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_WIN10_HANDLER_H_

chrome/browser/ui/webui/welcome_win10_ui.cc → chrome/browser/ui/webui/welcome/welcome_win10_ui.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/welcome_win10_ui.h"
+#include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h"
 
 #include <memory>
 #include <string>
@@ -10,7 +10,7 @@
 #include "base/feature_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/welcome_win10_handler.h"
+#include "chrome/browser/ui/webui/welcome/welcome_win10_handler.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"

chrome/browser/ui/webui/welcome_win10_ui.h → chrome/browser/ui/webui/welcome/welcome_win10_ui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_WIN10_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_WELCOME_WIN10_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_WIN10_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_WIN10_UI_H_
 
 #include "content/public/browser/web_ui_controller.h"
 
@@ -18,4 +18,4 @@ class WelcomeWin10UI : public content::WebUIController {
   ~WelcomeWin10UI() override;
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_WELCOME_WIN10_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_WELCOME_WELCOME_WIN10_UI_H_