| Index: blimp/client/app/blimp_startup.cc
|
| diff --git a/blimp/client/app/blimp_startup.cc b/blimp/client/app/blimp_startup.cc
|
| deleted file mode 100644
|
| index 00884ef30bfcaa2e1856a21a968ebf366d12eda5..0000000000000000000000000000000000000000
|
| --- a/blimp/client/app/blimp_startup.cc
|
| +++ /dev/null
|
| @@ -1,80 +0,0 @@
|
| -// Copyright 2015 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 "blimp/client/app/blimp_startup.h"
|
| -
|
| -#include <string>
|
| -
|
| -#include "base/command_line.h"
|
| -#include "base/files/file_path.h"
|
| -#include "base/lazy_instance.h"
|
| -#include "base/logging.h"
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "base/path_service.h"
|
| -#include "blimp/client/app/blimp_discardable_memory_allocator.h"
|
| -#include "third_party/skia/include/core/SkGraphics.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
| -#include "ui/gl/init/gl_factory.h"
|
| -
|
| -class SkImageGenerator;
|
| -
|
| -namespace {
|
| -base::LazyInstance<std::unique_ptr<base::MessageLoopForUI>>
|
| - g_main_message_loop = LAZY_INSTANCE_INITIALIZER;
|
| -
|
| -base::LazyInstance<blimp::client::BlimpDiscardableMemoryAllocator>
|
| - g_discardable_memory_allocator = LAZY_INSTANCE_INITIALIZER;
|
| -
|
| -} // namespace
|
| -
|
| -namespace blimp {
|
| -namespace client {
|
| -
|
| -void InitializeLogging() {
|
| - // TODO(haibinlu): Remove this before release.
|
| - // Enables a few verbose log by default.
|
| - if (!base::CommandLine::ForCurrentProcess()->HasSwitch("vmodule")) {
|
| - std::string vmodule_entries =
|
| - "blimp_message_pump=1, blimp_connection=1,"
|
| - "blimp_compositor=1, blimp_compositor_manager=1,"
|
| - "remote_channel_impl=1";
|
| - base::CommandLine::ForCurrentProcess()->AppendSwitchASCII("vmodule",
|
| - vmodule_entries);
|
| - }
|
| -
|
| - logging::LoggingSettings settings;
|
| -#if defined(OS_ANDROID)
|
| - settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
|
| -#else
|
| - base::FilePath log_filename;
|
| - PathService::Get(base::DIR_EXE, &log_filename);
|
| - log_filename = log_filename.AppendASCII("blimp_client.log");
|
| - settings.logging_dest = logging::LOG_TO_ALL;
|
| - settings.log_file = log_filename.value().c_str();
|
| - settings.delete_old = logging::DELETE_OLD_LOG_FILE;
|
| -#endif // OS_ANDROID
|
| - logging::InitLogging(settings);
|
| - logging::SetLogItems(false, // Process ID
|
| - false, // Thread ID
|
| - false, // Timestamp
|
| - false); // Tick count
|
| - VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
|
| - << ", default verbosity = " << logging::GetVlogVerbosity();
|
| -}
|
| -
|
| -bool InitializeMainMessageLoop() {
|
| - // TODO(dtrainor): Initialize ICU?
|
| -
|
| - // Set the DiscardableMemoryAllocator.
|
| - base::DiscardableMemoryAllocator::SetInstance(
|
| - g_discardable_memory_allocator.Pointer());
|
| - if (!gl::init::InitializeGLOneOff())
|
| - return false;
|
| - SkGraphics::Init();
|
| - g_main_message_loop.Get().reset(new base::MessageLoopForUI);
|
| - return true;
|
| -}
|
| -
|
| -} // namespace client
|
| -} // namespace blimp
|
|
|