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" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 13 #include "build/build_config.h" |
13 #include "content/public/common/content_switches.h" | 14 #include "content/public/common/content_switches.h" |
14 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
15 #include "ui/base/ui_base_paths.h" | 16 #include "ui/base/ui_base_paths.h" |
16 #include "ui/views_content_client/views_content_browser_client.h" | 17 #include "ui/views_content_client/views_content_browser_client.h" |
17 | 18 |
18 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
19 #include "base/logging_win.h" | 20 #include "base/logging_win.h" |
20 #endif | 21 #endif |
21 | 22 |
22 namespace ui { | 23 namespace ui { |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 ui::SCALE_FACTOR_100P); | 72 ui::SCALE_FACTOR_100P); |
72 } | 73 } |
73 | 74 |
74 content::ContentBrowserClient* | 75 content::ContentBrowserClient* |
75 ViewsContentMainDelegate::CreateContentBrowserClient() { | 76 ViewsContentMainDelegate::CreateContentBrowserClient() { |
76 browser_client_.reset(new ViewsContentBrowserClient(views_content_client_)); | 77 browser_client_.reset(new ViewsContentBrowserClient(views_content_client_)); |
77 return browser_client_.get(); | 78 return browser_client_.get(); |
78 } | 79 } |
79 | 80 |
80 } // namespace ui | 81 } // namespace ui |
OLD | NEW |