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

Unified Diff: chrome/browser/installable/installable_logging.cc

Issue 2160513002: Extract AppBannerDataFetcher into an InstallableManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing nits Created 4 years, 4 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/installable/installable_logging.cc
diff --git a/chrome/browser/installable/installable_logging.cc b/chrome/browser/installable/installable_logging.cc
new file mode 100644
index 0000000000000000000000000000000000000000..caeb6362dbd5ff0378938ac3ce0715cfcbbac475
--- /dev/null
+++ b/chrome/browser/installable/installable_logging.cc
@@ -0,0 +1,142 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/installable/installable_logging.h"
+
+#include "base/macros.h"
+#include "base/strings/stringprintf.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/web_contents.h"
+
+namespace {
+
+static const std::string& GetMessagePrefix() {
Lei Zhang 2016/08/03 06:49:51 no need for static inside an anonymous namespace.
dominickn 2016/08/03 07:01:43 Done.
+ CR_DEFINE_STATIC_LOCAL(std::string, message_prefix,
+ ("Site cannot be installed: "));
+ return message_prefix;
+}
+
+// Error message strings corresponding to the InstallableErrorCode enum.
+static const char kRendererExitingMessage[] =
+ "the page is in the process of being closed";
+static const char kRendererCancelledMessage[] =
+ "the page has requested the banner prompt be cancelled";
+static const char kUserNavigatedMessage[] =
+ "the page was navigated before the banner could be shown";
+static const char kNotInMainFrameMessage[] =
+ "the page is not loaded in the main frame";
+static const char kNotFromSecureOriginMessage[] =
+ "the page is not served from a secure origin";
+static const char kNoManifestMessage[] =
+ "the page has no manifest <link> URL";
+static const char kManifestEmptyMessage[] =
+ "the manifest could not be fetched, is empty, or could not be parsed";
+static const char kStartUrlNotValidMessage[] =
+ "the start URL in manifest is not valid";
+static const char kManifestMissingNameOrShortNameMessage[] =
+ "one of manifest name or short name must be specified";
+static const char kManifestDisplayNotSupportedMessage[] =
+ "the manifest display property must be set to 'standalone' or 'fullscreen'";
+static const char kManifestMissingSuitableIconMessage[] =
+ "the manifest does not contain a suitable icon - PNG format of at least "
+ "%spx is required, and the sizes attribute must be set";
+static const char kNoMatchingServiceWorkerMessage[] =
+ "no matching service worker detected. You may need to reload the page, or "
+ "check that the service worker for the current page also controls the "
+ "start URL from the manifest";
+static const char kNoAcceptableIconMessage[] =
+ "a %spx square icon is required, but no supplied icon meets this "
+ "requirement";
+static const char kCannotDownloadIconMessage[] =
+ "could not download the specified icon";
+static const char kNoIconAvailableMessage[] =
+ "no icon available to display";
+static const char kPlatformNotSupportedOnAndroidMessage[] =
+ "the specified application platform is not supported on Android";
+static const char kNoIdSpecifiedMessage[] =
+ "no Play store ID provided";
+static const char kIdsDoNotMatchMessage[] =
+ "a Play Store app URL and Play Store ID were specified in the manifest, "
+ "but they do not match";
+
+} // anonymous namespace
Lei Zhang 2016/08/03 06:49:51 omit anonymous
dominickn 2016/08/03 07:01:43 Done.
+
+void LogErrorToConsole(content::WebContents* web_contents,
Lei Zhang 2016/08/03 06:49:51 Nobody is calling this yet?
dominickn 2016/08/03 07:01:43 It's being called in the follow-up CL - crrev.com/
+ InstallableErrorCode code,
+ const std::string& param) {
+ if (!web_contents)
+ return;
+
+ content::ConsoleMessageLevel severity = content::CONSOLE_MESSAGE_LEVEL_ERROR;
+ const char* pattern = nullptr;
+ switch (code) {
+ case NO_ERROR_DETECTED:
+ case MAX_ERROR_CODE:
+ return;
+ case RENDERER_EXITING:
+ pattern = kRendererExitingMessage;
+ break;
+ case RENDERER_CANCELLED:
+ pattern = kRendererCancelledMessage;
+ severity = content::CONSOLE_MESSAGE_LEVEL_LOG;
+ break;
+ case USER_NAVIGATED:
+ pattern = kUserNavigatedMessage;
+ severity = content::CONSOLE_MESSAGE_LEVEL_WARNING;
+ break;
+ case NOT_IN_MAIN_FRAME:
+ pattern = kNotInMainFrameMessage;
+ break;
+ case NOT_FROM_SECURE_ORIGIN:
+ pattern = kNotFromSecureOriginMessage;
+ break;
+ case NO_MANIFEST:
+ pattern = kNoManifestMessage;
+ break;
+ case MANIFEST_EMPTY:
+ pattern = kManifestEmptyMessage;
+ break;
+ case START_URL_NOT_VALID:
+ pattern = kStartUrlNotValidMessage;
+ break;
+ case MANIFEST_MISSING_NAME_OR_SHORT_NAME:
+ pattern = kManifestMissingNameOrShortNameMessage;
+ break;
+ case MANIFEST_DISPLAY_NOT_SUPPORTED:
+ pattern = kManifestDisplayNotSupportedMessage;
+ break;
+ case MANIFEST_MISSING_SUITABLE_ICON:
+ pattern = kManifestMissingSuitableIconMessage;
+ break;
+ case NO_MATCHING_SERVICE_WORKER:
+ pattern = kNoMatchingServiceWorkerMessage;
+ break;
+ case NO_ACCEPTABLE_ICON:
+ pattern = kNoAcceptableIconMessage;
+ break;
+ case CANNOT_DOWNLOAD_ICON:
+ pattern = kCannotDownloadIconMessage;
+ break;
+ case NO_ICON_AVAILABLE:
+ pattern = kNoIconAvailableMessage;
+ break;
+ case PLATFORM_NOT_SUPPORTED_ON_ANDROID:
+ pattern = kPlatformNotSupportedOnAndroidMessage;
+ severity = content::CONSOLE_MESSAGE_LEVEL_WARNING;
+ break;
+ case NO_ID_SPECIFIED:
+ pattern = kNoIdSpecifiedMessage;
+ break;
+ case IDS_DO_NOT_MATCH:
+ pattern = kIdsDoNotMatchMessage;
+ break;
+ }
+
+ if (!pattern)
+ return;
+ std::string message = param.empty() ?
+ pattern : base::StringPrintf(pattern, param.c_str());
+ web_contents->GetMainFrame()->AddMessageToConsole(
+ severity, GetMessagePrefix() + message);
+}

Powered by Google App Engine
This is Rietveld 408576698