OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/shell/shell_content_browser_client.h" | 5 #include "content/shell/shell_content_browser_client.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "content/browser/webui/empty_web_ui_factory.h" | 8 #include "content/browser/webui/empty_web_ui_factory.h" |
9 #include "content/shell/shell.h" | 9 #include "content/shell/shell.h" |
10 #include "content/shell/shell_browser_main.h" | 10 #include "content/shell/shell_browser_main.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 } | 109 } |
110 | 110 |
111 void ShellContentBrowserClient::AppendExtraCommandLineSwitches( | 111 void ShellContentBrowserClient::AppendExtraCommandLineSwitches( |
112 CommandLine* command_line, int child_process_id) { | 112 CommandLine* command_line, int child_process_id) { |
113 } | 113 } |
114 | 114 |
115 std::string ShellContentBrowserClient::GetApplicationLocale() { | 115 std::string ShellContentBrowserClient::GetApplicationLocale() { |
116 return std::string(); | 116 return std::string(); |
117 } | 117 } |
118 | 118 |
119 std::string ShellContentBrowserClient::GetAcceptLangs(const TabContents* tab) { | 119 std::string ShellContentBrowserClient::GetAcceptLangs( |
| 120 content::BrowserContext* context) { |
120 return std::string(); | 121 return std::string(); |
121 } | 122 } |
122 | 123 |
123 SkBitmap* ShellContentBrowserClient::GetDefaultFavicon() { | 124 SkBitmap* ShellContentBrowserClient::GetDefaultFavicon() { |
124 static SkBitmap empty; | 125 static SkBitmap empty; |
125 return ∅ | 126 return ∅ |
126 } | 127 } |
127 | 128 |
128 bool ShellContentBrowserClient::AllowAppCache( | 129 bool ShellContentBrowserClient::AllowAppCache( |
129 const GURL& manifest_url, | 130 const GURL& manifest_url, |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
342 tab_contents_view->tab_contents()->browser_context(), | 343 tab_contents_view->tab_contents()->browser_context(), |
343 GURL(), | 344 GURL(), |
344 tab_contents_view->tab_contents()->GetSiteInstance(), | 345 tab_contents_view->tab_contents()->GetSiteInstance(), |
345 route_id, | 346 route_id, |
346 tab_contents_view->tab_contents()); | 347 tab_contents_view->tab_contents()); |
347 return shell->tab_contents(); | 348 return shell->tab_contents(); |
348 } | 349 } |
349 #endif | 350 #endif |
350 | 351 |
351 } // namespace content | 352 } // namespace content |
OLD | NEW |