| 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 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1146 return fast_unload_controller_->TabsNeedBeforeUnloadFired(); | 1146 return fast_unload_controller_->TabsNeedBeforeUnloadFired(); |
| 1147 return unload_controller_->TabsNeedBeforeUnloadFired(); | 1147 return unload_controller_->TabsNeedBeforeUnloadFired(); |
| 1148 } | 1148 } |
| 1149 | 1149 |
| 1150 void Browser::OverscrollUpdate(int delta_y) { | 1150 void Browser::OverscrollUpdate(int delta_y) { |
| 1151 window_->OverscrollUpdate(delta_y); | 1151 window_->OverscrollUpdate(delta_y); |
| 1152 } | 1152 } |
| 1153 | 1153 |
| 1154 void Browser::ShowValidationMessage(content::WebContents* web_contents, | 1154 void Browser::ShowValidationMessage(content::WebContents* web_contents, |
| 1155 const gfx::Rect& anchor_in_root_view, | 1155 const gfx::Rect& anchor_in_root_view, |
| 1156 const string16& main_text, | 1156 const base::string16& main_text, |
| 1157 const string16& sub_text) { | 1157 const base::string16& sub_text) { |
| 1158 RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView(); | 1158 RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView(); |
| 1159 if (rwhv) { | 1159 if (rwhv) { |
| 1160 validation_message_bubble_ = | 1160 validation_message_bubble_ = |
| 1161 chrome::ValidationMessageBubble::CreateAndShow( | 1161 chrome::ValidationMessageBubble::CreateAndShow( |
| 1162 rwhv->GetRenderWidgetHost(), | 1162 rwhv->GetRenderWidgetHost(), |
| 1163 anchor_in_root_view, | 1163 anchor_in_root_view, |
| 1164 main_text, | 1164 main_text, |
| 1165 sub_text); | 1165 sub_text); |
| 1166 } | 1166 } |
| 1167 } | 1167 } |
| (...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2290 if (contents && !allow_js_access) { | 2290 if (contents && !allow_js_access) { |
| 2291 contents->web_contents()->GetController().LoadURL( | 2291 contents->web_contents()->GetController().LoadURL( |
| 2292 target_url, | 2292 target_url, |
| 2293 content::Referrer(), | 2293 content::Referrer(), |
| 2294 content::PAGE_TRANSITION_LINK, | 2294 content::PAGE_TRANSITION_LINK, |
| 2295 std::string()); // No extra headers. | 2295 std::string()); // No extra headers. |
| 2296 } | 2296 } |
| 2297 | 2297 |
| 2298 return contents != NULL; | 2298 return contents != NULL; |
| 2299 } | 2299 } |
| OLD | NEW |