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

Unified Diff: content/shell/app/shell_main_delegate.cc

Issue 2525033003: Display content_shell error messages. (Closed)
Patch Set: Created 4 years, 1 month 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: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 1a72b4be9dd669d475848944cd4caa673975092b..1d8d564e1a1e27506d73c255679f30c8dc6eb26c 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -10,7 +10,6 @@
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/lazy_instance.h"
-#include "base/logging.h"
#include "base/path_service.h"
#include "build/build_config.h"
#include "cc/base/switches.h"
@@ -29,7 +28,6 @@
#include "content/shell/common/layout_test/layout_test_content_client.h"
#include "content/shell/common/layout_test/layout_test_switches.h"
#include "content/shell/common/shell_content_client.h"
-#include "content/shell/common/shell_switches.h"
#include "content/shell/renderer/layout_test/layout_test_content_renderer_client.h"
#include "content/shell/renderer/shell_content_renderer_client.h"
#include "content/shell/utility/shell_content_utility_client.h"
@@ -100,18 +98,6 @@ const GUID kContentShellProviderName = {
{ 0x84, 0x13, 0xec, 0x94, 0xd8, 0xc2, 0xa4, 0xb6 } };
#endif
-void InitLogging() {
- base::FilePath log_filename;
- PathService::Get(base::DIR_EXE, &log_filename);
- log_filename = log_filename.AppendASCII("content_shell.log");
- logging::LoggingSettings settings;
- settings.logging_dest = logging::LOG_TO_ALL;
- settings.log_file = log_filename.value().c_str();
- settings.delete_old = logging::DELETE_OLD_LOG_FILE;
- logging::InitLogging(settings);
- logging::SetLogItems(true, true, true, true);
-}
-
} // namespace
namespace content {
@@ -142,7 +128,6 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
EnsureCorrectResolutionSettings();
#endif // OS_MACOSX
- InitLogging();
Dirk Pranke 2016/11/29 02:20:48 You should probably leave the logging code in and
Jack Bates 2016/12/01 17:47:38 Done.
if (command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)) {
// If CheckLayoutSystemDeps succeeds, we don't exit early. Instead we
// continue and try to load the fonts in BlinkTestPlatformInitialize

Powered by Google App Engine
This is Rietveld 408576698