OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/views_content_client/views_content_main_delegate.h" | 5 #include "ui/views_content_client/views_content_main_delegate.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 | 33 |
34 ViewsContentMainDelegate::ViewsContentMainDelegate( | 34 ViewsContentMainDelegate::ViewsContentMainDelegate( |
35 ViewsContentClient* views_content_client) | 35 ViewsContentClient* views_content_client) |
36 : views_content_client_(views_content_client) { | 36 : views_content_client_(views_content_client) { |
37 } | 37 } |
38 | 38 |
39 ViewsContentMainDelegate::~ViewsContentMainDelegate() { | 39 ViewsContentMainDelegate::~ViewsContentMainDelegate() { |
40 } | 40 } |
41 | 41 |
42 bool ViewsContentMainDelegate::BasicStartupComplete(int* exit_code) { | 42 bool ViewsContentMainDelegate::BasicStartupComplete(int* exit_code) { |
43 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 43 const base::CommandLine& command_line = |
| 44 *base::CommandLine::ForCurrentProcess(); |
44 std::string process_type = | 45 std::string process_type = |
45 command_line.GetSwitchValueASCII(switches::kProcessType); | 46 command_line.GetSwitchValueASCII(switches::kProcessType); |
46 | 47 |
47 content::SetContentClient(&content_client_); | 48 content::SetContentClient(&content_client_); |
48 | 49 |
49 logging::LoggingSettings settings; | 50 logging::LoggingSettings settings; |
50 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 51 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
51 bool success = logging::InitLogging(settings); | 52 bool success = logging::InitLogging(settings); |
52 CHECK(success); | 53 CHECK(success); |
53 #if defined(OS_WIN) | 54 #if defined(OS_WIN) |
(...skipping 16 matching lines...) Expand all Loading... |
70 ui::SCALE_FACTOR_100P); | 71 ui::SCALE_FACTOR_100P); |
71 } | 72 } |
72 | 73 |
73 content::ContentBrowserClient* | 74 content::ContentBrowserClient* |
74 ViewsContentMainDelegate::CreateContentBrowserClient() { | 75 ViewsContentMainDelegate::CreateContentBrowserClient() { |
75 browser_client_.reset(new ViewsContentBrowserClient(views_content_client_)); | 76 browser_client_.reset(new ViewsContentBrowserClient(views_content_client_)); |
76 return browser_client_.get(); | 77 return browser_client_.get(); |
77 } | 78 } |
78 | 79 |
79 } // namespace ui | 80 } // namespace ui |
OLD | NEW |