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 3503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3514 UpdateMap::iterator i = scheduled_updates_.find(contents); | 3514 UpdateMap::iterator i = scheduled_updates_.find(contents); |
3515 if (i != scheduled_updates_.end()) | 3515 if (i != scheduled_updates_.end()) |
3516 scheduled_updates_.erase(i); | 3516 scheduled_updates_.erase(i); |
3517 } | 3517 } |
3518 | 3518 |
3519 | 3519 |
3520 /////////////////////////////////////////////////////////////////////////////// | 3520 /////////////////////////////////////////////////////////////////////////////// |
3521 // Browser, Getters for UI (private): | 3521 // Browser, Getters for UI (private): |
3522 | 3522 |
3523 StatusBubble* Browser::GetStatusBubble() { | 3523 StatusBubble* Browser::GetStatusBubble() { |
3524 #if !defined(OS_MACOSX) | |
3525 // In kiosk mode, we want to always hide the status bubble. | 3524 // In kiosk mode, we want to always hide the status bubble. |
3526 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) | 3525 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) |
3527 return NULL; | 3526 return NULL; |
3528 #endif | |
3529 return window_ ? window_->GetStatusBubble() : NULL; | 3527 return window_ ? window_->GetStatusBubble() : NULL; |
3530 } | 3528 } |
3531 | 3529 |
3532 /////////////////////////////////////////////////////////////////////////////// | 3530 /////////////////////////////////////////////////////////////////////////////// |
3533 // Browser, Session restore functions (private): | 3531 // Browser, Session restore functions (private): |
3534 | 3532 |
3535 void Browser::SyncHistoryWithTabs(int index) { | 3533 void Browser::SyncHistoryWithTabs(int index) { |
3536 SessionService* session_service = | 3534 SessionService* session_service = |
3537 SessionServiceFactory::GetForProfileIfExisting(profile()); | 3535 SessionServiceFactory::GetForProfileIfExisting(profile()); |
3538 if (session_service) { | 3536 if (session_service) { |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3905 if (contents && !allow_js_access) { | 3903 if (contents && !allow_js_access) { |
3906 contents->web_contents()->GetController().LoadURL( | 3904 contents->web_contents()->GetController().LoadURL( |
3907 target_url, | 3905 target_url, |
3908 content::Referrer(), | 3906 content::Referrer(), |
3909 content::PAGE_TRANSITION_LINK, | 3907 content::PAGE_TRANSITION_LINK, |
3910 std::string()); // No extra headers. | 3908 std::string()); // No extra headers. |
3911 } | 3909 } |
3912 | 3910 |
3913 return contents != NULL; | 3911 return contents != NULL; |
3914 } | 3912 } |
OLD | NEW |