Commit 2c3a7f3d authored by Oleg Davydov's avatar Oleg Davydov Committed by Commit Bot

Proper use of kDisableOfficeEditingComponentApp

Due to bad revert (https://crrev.com/c/1824299) we have compilation
error on ToT with chrome branded flag enabled (looks like we don't have
a buildbot with is_chrome_branded in args.gn). This commit is a small
fix for this.

TBR=ortuno@chromium.org,raymes@chromium.org,benwells@chromium.org

Change-Id: Ic4d375007ca87e8e6037b77bd01472000f523fbc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824894Reviewed-by: default avatarOleg Davydov <burunduk@chromium.org>
Commit-Queue: Oleg Davydov <burunduk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699780}
parent 73b9e0f4
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#include "ash/keyboard/ui/grit/keyboard_resources.h" #include "ash/keyboard/ui/grit/keyboard_resources.h"
#include "chromeos/constants/chromeos_features.h"
#include "chromeos/constants/chromeos_switches.h" #include "chromeos/constants/chromeos_switches.h"
#include "components/user_manager/user_manager.h" #include "components/user_manager/user_manager.h"
#include "content/public/browser/site_instance.h" #include "content/public/browser/site_instance.h"
...@@ -541,7 +542,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( ...@@ -541,7 +542,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
if (base::FeatureList::IsEnabled( if (base::FeatureList::IsEnabled(
features::kDisableOfficeEditingComponentApp)) { chromeos::features::kDisableOfficeEditingComponentApp)) {
Add(IDR_QUICKOFFICE_MANIFEST, Add(IDR_QUICKOFFICE_MANIFEST,
base::FilePath( base::FilePath(
FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice"))); FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice")));
......
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