Commit 17a965ba authored by Yulun Wu's avatar Yulun Wu Committed by Commit Bot

Flip Release Notes feature flag.

Temporarily disabling CrOS release notes for Browser tests due to Locale specific spacing issue.

http://crbug.com/991767

Bug: 968372
Change-Id: Ia9ce5903b68a8b60085967aeb310196be4c7ae25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1741478
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Reviewed-by: default avatarToni Baržić <tbarzic@chromium.org>
Auto-Submit: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685050}
parent e56c45c3
......@@ -4,17 +4,20 @@
#include "chrome/browser/chromeos/release_notes/release_notes_storage.h"
#include "base/command_line.h"
#include "base/version.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chromeos/login/login_state/login_state.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "components/user_manager/user_manager.h"
#include "components/version_info/version_info.h"
#include "content/public/common/content_switches.h"
namespace {
......@@ -36,6 +39,17 @@ ReleaseNotesStorage::ReleaseNotesStorage(Profile* profile)
ReleaseNotesStorage::~ReleaseNotesStorage() = default;
bool ReleaseNotesStorage::ShouldNotify() {
// TODO: remove after fixing http://crbug.com/991767.
const base::CommandLine* current_command_line =
base::CommandLine::ForCurrentProcess();
const bool is_running_test =
current_command_line->HasSwitch(::switches::kTestName) ||
current_command_line->HasSwitch(::switches::kTestType);
if (is_running_test) {
DLOG(WARNING) << "Ignoring Release Notes Notification for test.";
return false;
}
std::string user_email = profile_->GetProfileUserName();
if (base::EndsWith(user_email, "@google.com",
base::CompareCase::INSENSITIVE_ASCII) ||
......
......@@ -155,9 +155,8 @@ const base::Feature kParentalControlsSettings{
"ChromeOSParentalControlsSettings", base::FEATURE_DISABLED_BY_DEFAULT};
// Enables or disables Release Notes on Chrome OS.
// TODO(yulunwu): http://crbug.com/978201
const base::Feature kReleaseNotes{"ReleaseNotes",
base::FEATURE_DISABLED_BY_DEFAULT};
base::FEATURE_ENABLED_BY_DEFAULT};
// Enables or disables showing the battery level in the System Tray and Settings
// UI for supported Bluetooth Devices.
......
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