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 "chromecast/app/cast_main_delegate.h" | 5 #include "chromecast/app/cast_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/cpu.h" | 10 #include "base/cpu.h" |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); | 143 ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); |
144 | 144 |
145 base::FilePath pak_file; | 145 base::FilePath pak_file; |
146 CHECK(PathService::Get(FILE_CAST_PAK, &pak_file)); | 146 CHECK(PathService::Get(FILE_CAST_PAK, &pak_file)); |
147 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( | 147 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
148 pak_file, | 148 pak_file, |
149 ui::SCALE_FACTOR_NONE); | 149 ui::SCALE_FACTOR_NONE); |
150 } | 150 } |
151 | 151 |
152 content::ContentBrowserClient* CastMainDelegate::CreateContentBrowserClient() { | 152 content::ContentBrowserClient* CastMainDelegate::CreateContentBrowserClient() { |
153 browser_client_.reset(new CastContentBrowserClient); | 153 browser_client_ = CastContentBrowserClient::Create(); |
154 return browser_client_.get(); | 154 return browser_client_.get(); |
155 } | 155 } |
156 | 156 |
157 content::ContentRendererClient* | 157 content::ContentRendererClient* |
158 CastMainDelegate::CreateContentRendererClient() { | 158 CastMainDelegate::CreateContentRendererClient() { |
159 renderer_client_.reset(new CastContentRendererClient); | 159 renderer_client_ = CastContentRendererClient::Create(); |
160 return renderer_client_.get(); | 160 return renderer_client_.get(); |
161 } | 161 } |
162 | 162 |
163 } // namespace shell | 163 } // namespace shell |
164 } // namespace chromecast | 164 } // namespace chromecast |
OLD | NEW |