OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 // defined(OS_WIN) | 10 #endif // defined(OS_WIN) |
(...skipping 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1190 if (!handled) | 1190 if (!handled) |
1191 window()->HandleKeyboardEvent(event); | 1191 window()->HandleKeyboardEvent(event); |
1192 } | 1192 } |
1193 | 1193 |
1194 bool Browser::TabsNeedBeforeUnloadFired() { | 1194 bool Browser::TabsNeedBeforeUnloadFired() { |
1195 if (IsFastTabUnloadEnabled()) | 1195 if (IsFastTabUnloadEnabled()) |
1196 return fast_unload_controller_->TabsNeedBeforeUnloadFired(); | 1196 return fast_unload_controller_->TabsNeedBeforeUnloadFired(); |
1197 return unload_controller_->TabsNeedBeforeUnloadFired(); | 1197 return unload_controller_->TabsNeedBeforeUnloadFired(); |
1198 } | 1198 } |
1199 | 1199 |
1200 void Browser::OverscrollUpdate(float delta_y) { | |
1201 window_->OverscrollUpdate(delta_y); | |
1202 } | |
1203 | |
1204 void Browser::ShowValidationMessage(content::WebContents* web_contents, | 1200 void Browser::ShowValidationMessage(content::WebContents* web_contents, |
1205 const gfx::Rect& anchor_in_root_view, | 1201 const gfx::Rect& anchor_in_root_view, |
1206 const base::string16& main_text, | 1202 const base::string16& main_text, |
1207 const base::string16& sub_text) { | 1203 const base::string16& sub_text) { |
1208 RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView(); | 1204 RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView(); |
1209 if (rwhv) { | 1205 if (rwhv) { |
1210 validation_message_bubble_ = | 1206 validation_message_bubble_ = |
1211 chrome::ValidationMessageBubble::CreateAndShow( | 1207 chrome::ValidationMessageBubble::CreateAndShow( |
1212 rwhv->GetRenderWidgetHost(), | 1208 rwhv->GetRenderWidgetHost(), |
1213 anchor_in_root_view, | 1209 anchor_in_root_view, |
(...skipping 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2501 if (contents && !allow_js_access) { | 2497 if (contents && !allow_js_access) { |
2502 contents->web_contents()->GetController().LoadURL( | 2498 contents->web_contents()->GetController().LoadURL( |
2503 target_url, | 2499 target_url, |
2504 content::Referrer(), | 2500 content::Referrer(), |
2505 ui::PAGE_TRANSITION_LINK, | 2501 ui::PAGE_TRANSITION_LINK, |
2506 std::string()); // No extra headers. | 2502 std::string()); // No extra headers. |
2507 } | 2503 } |
2508 | 2504 |
2509 return contents != NULL; | 2505 return contents != NULL; |
2510 } | 2506 } |
OLD | NEW |