Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(412)

Unified Diff: chrome/browser/chromeos/customization_document.cc

Issue 216763004: OEM folder name support for apps installed from rootfs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/customization_document.cc
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc
index 260531a7670847bfffebaeaa4f471a9df79f76cc..f7214dd9961f37d2918243fa5bd58be7496a0eb7 100644
--- a/chrome/browser/chromeos/customization_document.cc
+++ b/chrome/browser/chromeos/customization_document.cc
@@ -20,6 +20,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/extensions/default_app_order.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/net/delay_network_call.h"
#include "chrome/browser/extensions/external_loader.h"
@@ -632,6 +633,8 @@ void ServicesCustomizationDocument::SetOemFolderName(
const base::DictionaryValue& root) {
std::string locale = g_browser_process->GetApplicationLocale();
std::string name = GetOemAppsFolderNameImpl(locale, root);
+ if (name.empty())
+ name = default_app_order::GetOemAppsFolderName();
if (!name.empty()) {
app_list::AppListSyncableService* service =
app_list::AppListSyncableServiceFactory::GetForProfile(profile);

Powered by Google App Engine
This is Rietveld 408576698