OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 #include "chrome/browser/chromeos/gdata/gdata_util.h" | 208 #include "chrome/browser/chromeos/gdata/gdata_util.h" |
209 #endif | 209 #endif |
210 | 210 |
211 #if defined(USE_ASH) | 211 #if defined(USE_ASH) |
212 #include "ash/ash_switches.h" | 212 #include "ash/ash_switches.h" |
213 #include "ash/shell.h" | 213 #include "ash/shell.h" |
214 #include "chrome/browser/ui/views/ash/panel_view_aura.h" | 214 #include "chrome/browser/ui/views/ash/panel_view_aura.h" |
215 #endif | 215 #endif |
216 | 216 |
217 using base::TimeDelta; | 217 using base::TimeDelta; |
| 218 using content::NativeWebKeyboardEvent; |
218 using content::NavigationController; | 219 using content::NavigationController; |
219 using content::NavigationEntry; | 220 using content::NavigationEntry; |
220 using content::OpenURLParams; | 221 using content::OpenURLParams; |
221 using content::PluginService; | 222 using content::PluginService; |
222 using content::Referrer; | 223 using content::Referrer; |
223 using content::SiteInstance; | 224 using content::SiteInstance; |
224 using content::SSLStatus; | 225 using content::SSLStatus; |
225 using content::UserMetricsAction; | 226 using content::UserMetricsAction; |
226 using content::WebContents; | 227 using content::WebContents; |
227 | 228 |
(...skipping 5195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5423 if (contents && !allow_js_access) { | 5424 if (contents && !allow_js_access) { |
5424 contents->web_contents()->GetController().LoadURL( | 5425 contents->web_contents()->GetController().LoadURL( |
5425 target_url, | 5426 target_url, |
5426 content::Referrer(), | 5427 content::Referrer(), |
5427 content::PAGE_TRANSITION_LINK, | 5428 content::PAGE_TRANSITION_LINK, |
5428 std::string()); // No extra headers. | 5429 std::string()); // No extra headers. |
5429 } | 5430 } |
5430 | 5431 |
5431 return contents != NULL; | 5432 return contents != NULL; |
5432 } | 5433 } |
OLD | NEW |