| 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 1373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1384 // When the current tab's SSL state changes, we need to update the URL | 1384 // When the current tab's SSL state changes, we need to update the URL |
| 1385 // bar to reflect the new state. | 1385 // bar to reflect the new state. |
| 1386 DCHECK(source); | 1386 DCHECK(source); |
| 1387 if (tab_strip_model_->GetActiveWebContents() == source) | 1387 if (tab_strip_model_->GetActiveWebContents() == source) |
| 1388 UpdateToolbar(false); | 1388 UpdateToolbar(false); |
| 1389 } | 1389 } |
| 1390 | 1390 |
| 1391 void Browser::AddNewContents(WebContents* source, | 1391 void Browser::AddNewContents(WebContents* source, |
| 1392 WebContents* new_contents, | 1392 WebContents* new_contents, |
| 1393 WindowOpenDisposition disposition, | 1393 WindowOpenDisposition disposition, |
| 1394 const gfx::Rect& initial_pos, | 1394 const gfx::Rect& initial_rect, |
| 1395 bool user_gesture, | 1395 bool user_gesture, |
| 1396 bool* was_blocked) { | 1396 bool* was_blocked) { |
| 1397 chrome::AddWebContents(this, source, new_contents, disposition, initial_pos, | 1397 chrome::AddWebContents(this, source, new_contents, disposition, initial_rect, |
| 1398 user_gesture, was_blocked); | 1398 user_gesture, was_blocked); |
| 1399 } | 1399 } |
| 1400 | 1400 |
| 1401 void Browser::ActivateContents(WebContents* contents) { | 1401 void Browser::ActivateContents(WebContents* contents) { |
| 1402 tab_strip_model_->ActivateTabAt( | 1402 tab_strip_model_->ActivateTabAt( |
| 1403 tab_strip_model_->GetIndexOfWebContents(contents), false); | 1403 tab_strip_model_->GetIndexOfWebContents(contents), false); |
| 1404 window_->Activate(); | 1404 window_->Activate(); |
| 1405 } | 1405 } |
| 1406 | 1406 |
| 1407 void Browser::DeactivateContents(WebContents* contents) { | 1407 void Browser::DeactivateContents(WebContents* contents) { |
| (...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2512 if (contents && !allow_js_access) { | 2512 if (contents && !allow_js_access) { |
| 2513 contents->web_contents()->GetController().LoadURL( | 2513 contents->web_contents()->GetController().LoadURL( |
| 2514 target_url, | 2514 target_url, |
| 2515 content::Referrer(), | 2515 content::Referrer(), |
| 2516 ui::PAGE_TRANSITION_LINK, | 2516 ui::PAGE_TRANSITION_LINK, |
| 2517 std::string()); // No extra headers. | 2517 std::string()); // No extra headers. |
| 2518 } | 2518 } |
| 2519 | 2519 |
| 2520 return contents != NULL; | 2520 return contents != NULL; |
| 2521 } | 2521 } |
| OLD | NEW |