Skip to content

Commit

Permalink
Move //chrome/browser/{chromeos => ash}/reset
Browse files Browse the repository at this point in the history
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Bug: 1101837, 1164001
Change-Id: I3dc9da6bec08833b888196dd612e6bbf7c733291
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2644544
Owners-Override: James Cook <jamescook@chromium.org>
Commit-Queue: Yeunjoo Choi <ychoi@igalia.com>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#847059}
  • Loading branch information
duswnchl authored and Chromium LUCI CQ committed Jan 26, 2021
1 parent e246b0a commit ded1825
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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_CHROMEOS_RESET_METRICS_H_
#define CHROME_BROWSER_CHROMEOS_RESET_METRICS_H_
#ifndef CHROME_BROWSER_ASH_RESET_METRICS_H_
#define CHROME_BROWSER_ASH_RESET_METRICS_H_

namespace chromeos {
namespace reset {
Expand Down Expand Up @@ -35,4 +35,4 @@ enum class DialogViewType {
} // namespace reset
} // namespace chromeos

#endif // CHROME_BROWSER_CHROMEOS_RESET_METRICS_H_
#endif // CHROME_BROWSER_ASH_RESET_METRICS_H_
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ source_set("chromeos") {
"../ash/account_manager/account_migration_runner.h",
"../ash/account_manager/child_account_type_changed_user_data.cc",
"../ash/account_manager/child_account_type_changed_user_data.h",
"../ash/reset/metrics.h",
"android_sms/android_sms_app_manager.cc",
"android_sms/android_sms_app_manager.h",
"android_sms/android_sms_app_manager_impl.cc",
Expand Down Expand Up @@ -2679,7 +2680,6 @@ source_set("chromeos") {
"remote_apps/remote_apps_model.cc",
"remote_apps/remote_apps_model.h",
"remote_apps/remote_apps_types.h",
"reset/metrics.h",
"scanning/lorgnette_scanner_manager.cc",
"scanning/lorgnette_scanner_manager.h",
"scanning/lorgnette_scanner_manager_factory.cc",
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/login/screens/reset_screen.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "base/task/post_task.h"
#include "base/values.h"
#include "build/branding_buildflags.h"
#include "chrome/browser/ash/reset/metrics.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
Expand All @@ -20,7 +21,6 @@
#include "chrome/browser/chromeos/login/screens/network_error.h"
#include "chrome/browser/chromeos/login/ui/login_display_host.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/reset/metrics.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/tpm_firmware_update.h"
#include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/webui/settings/reset_settings_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "ui/base/l10n/l10n_util.h"

#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chrome/browser/chromeos/reset/metrics.h"
#include "chrome/browser/ash/reset/metrics.h"
#include "chrome/common/pref_names.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)

Expand Down

0 comments on commit ded1825

Please sign in to comment.