Skip to content

GitLab

T
tangled
Commit b68dea23 authored by Hector Carmona's avatar Hector Carmona Committed by Commit Bot
Browse files
Options

Navi: Remove nux folder from within c/b/u/w/welcome. 

Bug: 986979
Change-Id: Ifd3da3466ddedbb80c211871663b119405dbbb38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715883Reviewed-by: default avatarNicolas Ouellet-Payeur <nicolaso@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Auto-Submit: Hector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681097}
parent 8d2fed71
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 61 deletions
chrome/browser/ui/BUILD.gn
View file @ b68dea23
...@@ -2051,22 +2051,22 @@ jumbo_split_static_library("ui") { ...@@ -2051,22 +2051,22 @@ jumbo_split_static_library("ui") {
"webui/signin/user_manager_screen_handler.h", "webui/signin/user_manager_screen_handler.h",
"webui/signin/user_manager_ui.cc", "webui/signin/user_manager_ui.cc",
"webui/signin/user_manager_ui.h", "webui/signin/user_manager_ui.h",
"webui/welcome/nux/bookmark_handler.cc", "webui/welcome/bookmark_handler.cc",
"webui/welcome/nux/bookmark_handler.h", "webui/welcome/bookmark_handler.h",
"webui/welcome/nux/bookmark_item.cc", "webui/welcome/bookmark_item.cc",
"webui/welcome/nux/bookmark_item.h", "webui/welcome/bookmark_item.h",
"webui/welcome/nux/constants.cc", "webui/welcome/constants.cc",
"webui/welcome/nux/constants.h", "webui/welcome/constants.h",
"webui/welcome/nux/google_apps_handler.cc", "webui/welcome/google_apps_handler.cc",
"webui/welcome/nux/google_apps_handler.h", "webui/welcome/google_apps_handler.h",
"webui/welcome/nux/ntp_background_fetcher.cc", "webui/welcome/ntp_background_fetcher.cc",
"webui/welcome/nux/ntp_background_fetcher.h", "webui/welcome/ntp_background_fetcher.h",
"webui/welcome/nux/ntp_background_handler.cc", "webui/welcome/ntp_background_handler.cc",
"webui/welcome/nux/ntp_background_handler.h", "webui/welcome/ntp_background_handler.h",
"webui/welcome/nux/set_as_default_handler.cc",
"webui/welcome/nux/set_as_default_handler.h",
"webui/welcome/nux_helper.cc", "webui/welcome/nux_helper.cc",
"webui/welcome/nux_helper.h", "webui/welcome/nux_helper.h",
"webui/welcome/set_as_default_handler.cc",
"webui/welcome/set_as_default_handler.h",
"webui/welcome/welcome_handler.cc", "webui/welcome/welcome_handler.cc",
"webui/welcome/welcome_handler.h", "webui/welcome/welcome_handler.h",
"webui/welcome/welcome_ui.cc", "webui/welcome/welcome_ui.cc",
......
chrome/browser/ui/webui/welcome/nux/bookmark_handler.cc → chrome/browser/ui/webui/welcome/bookmark_handler.cc
View file @ b68dea23
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/webui/welcome/nux/bookmark_handler.h" #include "chrome/browser/ui/webui/welcome/bookmark_handler.h"
#include "base/bind.h" #include "base/bind.h"
#include "chrome/grit/browser_resources.h" #include "chrome/grit/browser_resources.h"
......
chrome/browser/ui/webui/welcome/nux/bookmark_handler.h → chrome/browser/ui/webui/welcome/bookmark_handler.h
View file @ b68dea23
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_BOOKMARK_HANDLER_H_ #ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_BOOKMARK_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_BOOKMARK_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_WELCOME_BOOKMARK_HANDLER_H_
#include "base/macros.h" #include "base/macros.h"
#include "base/values.h" #include "base/values.h"
...@@ -34,4 +34,4 @@ class BookmarkHandler : public content::WebUIMessageHandler { ...@@ -34,4 +34,4 @@ class BookmarkHandler : public content::WebUIMessageHandler {
} // namespace nux } // namespace nux
#endif // CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_BOOKMARK_HANDLER_H_ #endif // CHROME_BROWSER_UI_WEBUI_WELCOME_BOOKMARK_HANDLER_H_
chrome/browser/ui/webui/welcome/nux/bookmark_item.cc → chrome/browser/ui/webui/welcome/bookmark_item.cc
View file @ b68dea23
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/webui/welcome/nux/bookmark_item.h" #include "chrome/browser/ui/webui/welcome/bookmark_item.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "base/values.h" #include "base/values.h"
......
chrome/browser/ui/webui/welcome/nux/bookmark_item.h → chrome/browser/ui/webui/welcome/bookmark_item.h
View file @ b68dea23
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_BOOKMARK_ITEM_H_ #ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_BOOKMARK_ITEM_H_
#define CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_BOOKMARK_ITEM_H_ #define CHROME_BROWSER_UI_WEBUI_WELCOME_BOOKMARK_ITEM_H_
#include <stddef.h> #include <stddef.h>
#include <string> #include <string>
...@@ -31,4 +31,4 @@ base::ListValue BookmarkItemsToListValue( ...@@ -31,4 +31,4 @@ base::ListValue BookmarkItemsToListValue(
} // namespace nux } // namespace nux
#endif // CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_BOOKMARK_ITEM_H_ #endif // CHROME_BROWSER_UI_WEBUI_WELCOME_BOOKMARK_ITEM_H_
chrome/browser/ui/webui/welcome/nux/constants.cc → chrome/browser/ui/webui/welcome/constants.cc
View file @ b68dea23
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/webui/welcome/nux/constants.h" #include "chrome/browser/ui/webui/welcome/constants.h"
#include "base/feature_list.h" #include "base/feature_list.h"
......
chrome/browser/ui/webui/welcome/nux/constants.h → chrome/browser/ui/webui/welcome/constants.h
View file @ b68dea23
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_CONSTANTS_H_ #ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_CONSTANTS_H_
#define CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_CONSTANTS_H_ #define CHROME_BROWSER_UI_WEBUI_WELCOME_CONSTANTS_H_
#include <string> #include <string>
#include "base/metrics/field_trial_params.h" #include "base/metrics/field_trial_params.h"
...@@ -25,4 +25,4 @@ extern const base::FeatureParam<bool> kNuxOnboardingShowGoogleApp; ...@@ -25,4 +25,4 @@ extern const base::FeatureParam<bool> kNuxOnboardingShowGoogleApp;
} // namespace nux } // namespace nux
#endif // CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_CONSTANTS_H_ #endif // CHROME_BROWSER_UI_WEBUI_WELCOME_CONSTANTS_H_
chrome/browser/ui/webui/welcome/nux/google_apps_handler.cc → chrome/browser/ui/webui/welcome/google_apps_handler.cc
View file @ b68dea23
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/webui/welcome/nux/google_apps_handler.h" #include "chrome/browser/ui/webui/welcome/google_apps_handler.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/metrics/field_trial_params.h" #include "base/metrics/field_trial_params.h"
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "base/stl_util.h" #include "base/stl_util.h"
#include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/welcome/nux/bookmark_item.h" #include "chrome/browser/ui/webui/welcome/bookmark_item.h"
#include "chrome/browser/ui/webui/welcome/nux_helper.h" #include "chrome/browser/ui/webui/welcome/nux_helper.h"
#include "chrome/grit/chrome_unscaled_resources.h" #include "chrome/grit/chrome_unscaled_resources.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
...@@ -109,7 +109,7 @@ void GoogleAppsHandler::HandleCacheGoogleAppIcon(const base::ListValue* args) { ...@@ -109,7 +109,7 @@ void GoogleAppsHandler::HandleCacheGoogleAppIcon(const base::ListValue* args) {
int appId; int appId;
args->GetInteger(0, &appId); args->GetInteger(0, &appId);
const BookmarkItem* selectedApp = NULL; const BookmarkItem* selectedApp = nullptr;
for (const auto& google_app : google_apps_) { for (const auto& google_app : google_apps_) {
if (google_app.id == appId) { if (google_app.id == appId) {
selectedApp = &google_app; selectedApp = &google_app;
......
chrome/browser/ui/webui/welcome/nux/google_apps_handler.h → chrome/browser/ui/webui/welcome/google_apps_handler.h
View file @ b68dea23
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_GOOGLE_APPS_HANDLER_H_ #ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_GOOGLE_APPS_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_GOOGLE_APPS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_WELCOME_GOOGLE_APPS_HANDLER_H_
#include <vector> #include <vector>
#include "base/macros.h" #include "base/macros.h"
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/ui/webui/welcome/nux/bookmark_item.h" #include "chrome/browser/ui/webui/welcome/bookmark_item.h"
#include "content/public/browser/web_ui_message_handler.h" #include "content/public/browser/web_ui_message_handler.h"
namespace nux { namespace nux {
...@@ -45,4 +45,4 @@ class GoogleAppsHandler : public content::WebUIMessageHandler { ...@@ -45,4 +45,4 @@ class GoogleAppsHandler : public content::WebUIMessageHandler {
} // namespace nux } // namespace nux
#endif // CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_GOOGLE_APPS_HANDLER_H_ #endif // CHROME_BROWSER_UI_WEBUI_WELCOME_GOOGLE_APPS_HANDLER_H_
chrome/browser/ui/webui/welcome/nux/ntp_background_fetcher.cc → chrome/browser/ui/webui/welcome/ntp_background_fetcher.cc
View file @ b68dea23
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/webui/welcome/nux/ntp_background_fetcher.h" #include "chrome/browser/ui/webui/welcome/ntp_background_fetcher.h"
#include <utility> #include <utility>
......
chrome/browser/ui/webui/welcome/nux/ntp_background_fetcher.h → chrome/browser/ui/webui/welcome/ntp_background_fetcher.h
View file @ b68dea23
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_NTP_BACKGROUND_FETCHER_H_ #ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_NTP_BACKGROUND_FETCHER_H_
#define CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_NTP_BACKGROUND_FETCHER_H_ #define CHROME_BROWSER_UI_WEBUI_WELCOME_NTP_BACKGROUND_FETCHER_H_
#include <memory> #include <memory>
#include <string> #include <string>
...@@ -37,4 +37,4 @@ class NtpBackgroundFetcher { ...@@ -37,4 +37,4 @@ class NtpBackgroundFetcher {
} // namespace nux } // namespace nux
#endif // CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_NTP_BACKGROUND_FETCHER_H_ #endif // CHROME_BROWSER_UI_WEBUI_WELCOME_NTP_BACKGROUND_FETCHER_H_
chrome/browser/ui/webui/welcome/nux/ntp_background_handler.cc → chrome/browser/ui/webui/welcome/ntp_background_handler.cc
View file @ b68dea23
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/webui/welcome/nux/ntp_background_handler.h" #include "chrome/browser/ui/webui/welcome/ntp_background_handler.h"
#include <memory> #include <memory>
#include <utility> #include <utility>
#include "base/bind.h" #include "base/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search/background/onboarding_ntp_backgrounds.h" #include "chrome/browser/search/background/onboarding_ntp_backgrounds.h"
...@@ -73,7 +74,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) { ...@@ -73,7 +74,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) {
element->SetString("title", element->SetString("title",
l10n_util::GetStringUTF8( l10n_util::GetStringUTF8(
IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_EARTH_TITLE)); IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_EARTH_TITLE));
element->SetString("imageUrl", kUrlPrefix + std::to_string(id)); element->SetString("imageUrl", kUrlPrefix + base::NumberToString(id));
element->SetString("thumbnailClass", "earth"); element->SetString("thumbnailClass", "earth");
list_value.Append(std::move(element)); list_value.Append(std::move(element));
...@@ -83,7 +84,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) { ...@@ -83,7 +84,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) {
element->SetString( element->SetString(
"title", l10n_util::GetStringUTF8( "title", l10n_util::GetStringUTF8(
IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_CITYSCAPE_TITLE)); IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_CITYSCAPE_TITLE));
element->SetString("imageUrl", kUrlPrefix + std::to_string(id)); element->SetString("imageUrl", kUrlPrefix + base::NumberToString(id));
element->SetString("thumbnailClass", "cityscape"); element->SetString("thumbnailClass", "cityscape");
list_value.Append(std::move(element)); list_value.Append(std::move(element));
...@@ -93,7 +94,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) { ...@@ -93,7 +94,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) {
element->SetString( element->SetString(
"title", l10n_util::GetStringUTF8( "title", l10n_util::GetStringUTF8(
IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_LANDSCAPE_TITLE)); IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_LANDSCAPE_TITLE));
element->SetString("imageUrl", kUrlPrefix + std::to_string(id)); element->SetString("imageUrl", kUrlPrefix + base::NumberToString(id));
element->SetString("thumbnailClass", "landscape"); element->SetString("thumbnailClass", "landscape");
list_value.Append(std::move(element)); list_value.Append(std::move(element));
...@@ -103,7 +104,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) { ...@@ -103,7 +104,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) {
element->SetString("title", element->SetString("title",
l10n_util::GetStringUTF8( l10n_util::GetStringUTF8(
IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_ART_TITLE)); IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_ART_TITLE));
element->SetString("imageUrl", kUrlPrefix + std::to_string(id)); element->SetString("imageUrl", kUrlPrefix + base::NumberToString(id));
element->SetString("thumbnailClass", "art"); element->SetString("thumbnailClass", "art");
list_value.Append(std::move(element)); list_value.Append(std::move(element));
...@@ -114,7 +115,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) { ...@@ -114,7 +115,7 @@ void NtpBackgroundHandler::HandleGetBackgrounds(const base::ListValue* args) {
"title", "title",
l10n_util::GetStringUTF8( l10n_util::GetStringUTF8(
IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_GEOMETRIC_SHAPES_TITLE)); IDS_ONBOARDING_WELCOME_NTP_BACKGROUND_GEOMETRIC_SHAPES_TITLE));
element->SetString("imageUrl", kUrlPrefix + std::to_string(id)); element->SetString("imageUrl", kUrlPrefix + base::NumberToString(id));
element->SetString("thumbnailClass", "geometric-shapes"); element->SetString("thumbnailClass", "geometric-shapes");
list_value.Append(std::move(element)); list_value.Append(std::move(element));
......
chrome/browser/ui/webui/welcome/nux/ntp_background_handler.h → chrome/browser/ui/webui/welcome/ntp_background_handler.h
View file @ b68dea23
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_NTP_BACKGROUND_HANDLER_H_ #ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_NTP_BACKGROUND_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_NTP_BACKGROUND_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_WELCOME_NTP_BACKGROUND_HANDLER_H_
#include "content/public/browser/web_ui_message_handler.h" #include "content/public/browser/web_ui_message_handler.h"
...@@ -28,4 +28,4 @@ class NtpBackgroundHandler : public content::WebUIMessageHandler { ...@@ -28,4 +28,4 @@ class NtpBackgroundHandler : public content::WebUIMessageHandler {
} // namespace nux } // namespace nux
#endif // CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_NTP_BACKGROUND_HANDLER_H_ #endif // CHROME_BROWSER_UI_WEBUI_WELCOME_NTP_BACKGROUND_HANDLER_H_
chrome/browser/ui/webui/welcome/nux/README deleted 100644 → 0
View file @ 8d2fed71
New User Experience Experiment (NUX). Code here will prompt new users to go
through an onboarding experience to customize their new browser install to
their common usages.
\ No newline at end of file
chrome/browser/ui/webui/welcome/nux_helper.cc
View file @ b68dea23
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search/ntp_features.h" #include "chrome/browser/search/ntp_features.h"
#include "chrome/browser/search/search.h" #include "chrome/browser/search/search.h"
#include "chrome/browser/ui/webui/welcome/nux/constants.h" #include "chrome/browser/ui/webui/welcome/constants.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_map.h"
......
chrome/browser/ui/webui/welcome/nux/set_as_default_handler.cc → chrome/browser/ui/webui/welcome/set_as_default_handler.cc
View file @ b68dea23
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/ui/webui/welcome/nux/set_as_default_handler.h" #include "chrome/browser/ui/webui/welcome/set_as_default_handler.h"
namespace nux { namespace nux {
......
chrome/browser/ui/webui/welcome/nux/set_as_default_handler.h → chrome/browser/ui/webui/welcome/set_as_default_handler.h
View file @ b68dea23
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_SET_AS_DEFAULT_HANDLER_H_ #ifndef CHROME_BROWSER_UI_WEBUI_WELCOME_SET_AS_DEFAULT_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_SET_AS_DEFAULT_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_WELCOME_SET_AS_DEFAULT_HANDLER_H_
#include "base/macros.h" #include "base/macros.h"
#include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
...@@ -23,4 +23,4 @@ class SetAsDefaultHandler : public settings::DefaultBrowserHandler { ...@@ -23,4 +23,4 @@ class SetAsDefaultHandler : public settings::DefaultBrowserHandler {
} // namespace nux } // namespace nux
#endif // CHROME_BROWSER_UI_WEBUI_WELCOME_NUX_SET_AS_DEFAULT_HANDLER_H_ #endif // CHROME_BROWSER_UI_WEBUI_WELCOME_SET_AS_DEFAULT_HANDLER_H_
chrome/browser/ui/webui/welcome/welcome_ui.cc
View file @ b68dea23
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "chrome/browser/signin/account_consistency_mode_manager.h" #include "chrome/browser/signin/account_consistency_mode_manager.h"
#include "chrome/browser/ui/webui/localized_string.h" #include "chrome/browser/ui/webui/localized_string.h"
#include "chrome/browser/ui/webui/welcome/nux/bookmark_handler.h" #include "chrome/browser/ui/webui/welcome/bookmark_handler.h"
#include "chrome/browser/ui/webui/welcome/nux/constants.h" #include "chrome/browser/ui/webui/welcome/constants.h"
#include "chrome/browser/ui/webui/welcome/nux/google_apps_handler.h" #include "chrome/browser/ui/webui/welcome/google_apps_handler.h"
#include "chrome/browser/ui/webui/welcome/nux/ntp_background_handler.h" #include "chrome/browser/ui/webui/welcome/ntp_background_handler.h"
#include "chrome/browser/ui/webui/welcome/nux/set_as_default_handler.h"
#include "chrome/browser/ui/webui/welcome/nux_helper.h" #include "chrome/browser/ui/webui/welcome/nux_helper.h"
#include "chrome/browser/ui/webui/welcome/set_as_default_handler.h"
#include "chrome/browser/ui/webui/welcome/welcome_handler.h" #include "chrome/browser/ui/webui/welcome/welcome_handler.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chrome/grit/chrome_unscaled_resources.h" #include "chrome/grit/chrome_unscaled_resources.h"
......
chrome/browser/ui/webui/welcome/welcome_ui.h
View file @ b68dea23
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/welcome/nux/ntp_background_fetcher.h" #include "chrome/browser/ui/webui/welcome/ntp_background_fetcher.h"
#include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_controller.h"
#include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_data_source.h"
#include "url/gurl.h" #include "url/gurl.h"
......
tools/traffic_annotation/summary/annotations.xml
View file @ b68dea23
...@@ -159,7 +159,7 @@ Refer to README.md for content description and update process. ...@@ -159,7 +159,7 @@ Refer to README.md for content description and update process.
<item id="ntp_custom_link_checker_request" hash_code="78408551" type="0" deprecated="2018-10-26" content_hash_code="13407730" file_path=""/> <item id="ntp_custom_link_checker_request" hash_code="78408551" type="0" deprecated="2018-10-26" content_hash_code="13407730" file_path=""/>
<item id="ntp_icon_source" hash_code="29197139" type="0" content_hash_code="16399294" os_list="linux,windows" file_path="chrome/browser/search/ntp_icon_source.cc"/> <item id="ntp_icon_source" hash_code="29197139" type="0" content_hash_code="16399294" os_list="linux,windows" file_path="chrome/browser/search/ntp_icon_source.cc"/>
<item id="ntp_snippets_fetch" hash_code="15418154" type="0" content_hash_code="10078959" os_list="linux,windows" file_path="components/ntp_snippets/remote/json_request.cc"/> <item id="ntp_snippets_fetch" hash_code="15418154" type="0" content_hash_code="10078959" os_list="linux,windows" file_path="components/ntp_snippets/remote/json_request.cc"/>
<item id="nux_ntp_background_preview" hash_code="124847649" type="0" content_hash_code="31404656" os_list="linux,windows" file_path="chrome/browser/ui/webui/welcome/nux/ntp_background_fetcher.cc"/> <item id="nux_ntp_background_preview" hash_code="124847649" type="0" content_hash_code="31404656" os_list="linux,windows" file_path="chrome/browser/ui/webui/welcome/ntp_background_fetcher.cc"/>
<item id="oauth2_access_token_fetcher" hash_code="27915688" type="0" content_hash_code="33501872" os_list="linux,windows" file_path="google_apis/gaia/oauth2_access_token_fetcher_impl.cc"/> <item id="oauth2_access_token_fetcher" hash_code="27915688" type="0" content_hash_code="33501872" os_list="linux,windows" file_path="google_apis/gaia/oauth2_access_token_fetcher_impl.cc"/>
<item id="oauth2_api_call_flow" hash_code="29188932" type="2" content_hash_code="108831236" os_list="linux,windows" policy_fields="-1" file_path="google_apis/gaia/oauth2_api_call_flow.cc"/> <item id="oauth2_api_call_flow" hash_code="29188932" type="2" content_hash_code="108831236" os_list="linux,windows" policy_fields="-1" file_path="google_apis/gaia/oauth2_api_call_flow.cc"/>
<item id="oauth2_mint_token_flow" hash_code="1112842" type="1" second_id="29188932" content_hash_code="91581432" os_list="linux,windows" semantics_fields="1,2,3,4,5" policy_fields="3,4" file_path="google_apis/gaia/oauth2_mint_token_flow.cc"/> <item id="oauth2_mint_token_flow" hash_code="1112842" type="1" second_id="29188932" content_hash_code="91581432" os_list="linux,windows" semantics_fields="1,2,3,4,5" policy_fields="3,4" file_path="google_apis/gaia/oauth2_mint_token_flow.cc"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment