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 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1416 | 1416 |
1417 bool Browser::IsMouseLocked() const { | 1417 bool Browser::IsMouseLocked() const { |
1418 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked(); | 1418 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked(); |
1419 } | 1419 } |
1420 | 1420 |
1421 void Browser::OnWindowDidShow() { | 1421 void Browser::OnWindowDidShow() { |
1422 if (window_has_shown_) | 1422 if (window_has_shown_) |
1423 return; | 1423 return; |
1424 window_has_shown_ = true; | 1424 window_has_shown_ = true; |
1425 | 1425 |
1426 startup_metric_utils::RecordBrowserWindowDisplay(base::Time::Now()); | 1426 startup_metric_utils::RecordBrowserWindowDisplay(base::TimeTicks::Now()); |
1427 | 1427 |
1428 // Nothing to do for non-tabbed windows. | 1428 // Nothing to do for non-tabbed windows. |
1429 if (!is_type_tabbed()) | 1429 if (!is_type_tabbed()) |
1430 return; | 1430 return; |
1431 | 1431 |
1432 // Show any pending global error bubble. | 1432 // Show any pending global error bubble. |
1433 GlobalErrorService* service = | 1433 GlobalErrorService* service = |
1434 GlobalErrorServiceFactory::GetForProfile(profile()); | 1434 GlobalErrorServiceFactory::GetForProfile(profile()); |
1435 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 1435 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
1436 if (error) | 1436 if (error) |
(...skipping 1266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2703 if (contents && !allow_js_access) { | 2703 if (contents && !allow_js_access) { |
2704 contents->web_contents()->GetController().LoadURL( | 2704 contents->web_contents()->GetController().LoadURL( |
2705 target_url, | 2705 target_url, |
2706 content::Referrer(), | 2706 content::Referrer(), |
2707 ui::PAGE_TRANSITION_LINK, | 2707 ui::PAGE_TRANSITION_LINK, |
2708 std::string()); // No extra headers. | 2708 std::string()); // No extra headers. |
2709 } | 2709 } |
2710 | 2710 |
2711 return contents != NULL; | 2711 return contents != NULL; |
2712 } | 2712 } |
OLD | NEW |