| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ash/shell/content_client/shell_content_browser_client.h" | 5 #include "wm/shell/content_client/shell_content_browser_client.h" |
| 6 | 6 |
| 7 #include "ash/shell/content_client/shell_browser_main_parts.h" | 7 #include "wm/shell/content_client/shell_browser_main_parts.h" |
| 8 #include "third_party/skia/include/core/SkBitmap.h" | |
| 9 | 8 |
| 10 namespace ash { | 9 namespace wm { |
| 11 namespace shell { | 10 namespace shell { |
| 12 | 11 |
| 13 ShellContentBrowserClient::ShellContentBrowserClient() | 12 ShellContentBrowserClient::ShellContentBrowserClient() |
| 14 : shell_browser_main_parts_(NULL) { | 13 : shell_browser_main_parts_(NULL) { |
| 15 } | 14 } |
| 16 | 15 |
| 17 ShellContentBrowserClient::~ShellContentBrowserClient() { | 16 ShellContentBrowserClient::~ShellContentBrowserClient() { |
| 18 } | 17 } |
| 19 | 18 |
| 20 content::BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts( | 19 content::BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts( |
| 21 const content::MainFunctionParams& parameters) { | 20 const content::MainFunctionParams& parameters) { |
| 22 shell_browser_main_parts_ = new ShellBrowserMainParts(parameters); | 21 shell_browser_main_parts_ = new ShellBrowserMainParts(parameters); |
| 23 return shell_browser_main_parts_; | 22 return shell_browser_main_parts_; |
| 24 } | 23 } |
| 25 | 24 |
| 26 content::ShellBrowserContext* ShellContentBrowserClient::browser_context() { | 25 content::ShellBrowserContext* ShellContentBrowserClient::browser_context() { |
| 27 return shell_browser_main_parts_->browser_context(); | 26 return shell_browser_main_parts_->browser_context(); |
| 28 } | 27 } |
| 29 | 28 |
| 30 } // namespace examples | 29 } // namespace shell |
| 31 } // namespace views | 30 } // namespace wm |
| OLD | NEW |