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 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1638 InfoBarService::FromWebContents(source), | 1638 InfoBarService::FromWebContents(source), |
1639 infobars::InfoBarDelegate::kNoIconID, | 1639 infobars::InfoBarDelegate::kNoIconID, |
1640 l10n_util::GetStringUTF16(IDS_WEBWORKER_CRASHED_PROMPT), true); | 1640 l10n_util::GetStringUTF16(IDS_WEBWORKER_CRASHED_PROMPT), true); |
1641 } | 1641 } |
1642 | 1642 |
1643 void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) { | 1643 void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) { |
1644 if (web_contents == tab_strip_model_->GetActiveWebContents()) | 1644 if (web_contents == tab_strip_model_->GetActiveWebContents()) |
1645 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); | 1645 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); |
1646 } | 1646 } |
1647 | 1647 |
1648 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { | |
1649 if (web_contents == tab_strip_model_->GetActiveWebContents()) | |
1650 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); | |
1651 } | |
1652 | |
1653 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( | 1648 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( |
1654 WebContents* source) { | 1649 WebContents* source) { |
1655 return app_modal::JavaScriptDialogManager::GetInstance(); | 1650 return app_modal::JavaScriptDialogManager::GetInstance(); |
1656 } | 1651 } |
1657 | 1652 |
1658 content::ColorChooser* Browser::OpenColorChooser( | 1653 content::ColorChooser* Browser::OpenColorChooser( |
1659 WebContents* web_contents, | 1654 WebContents* web_contents, |
1660 SkColor initial_color, | 1655 SkColor initial_color, |
1661 const std::vector<content::ColorSuggestion>& suggestions) { | 1656 const std::vector<content::ColorSuggestion>& suggestions) { |
1662 return chrome::ShowColorChooser(web_contents, initial_color); | 1657 return chrome::ShowColorChooser(web_contents, initial_color); |
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2529 if (contents && !allow_js_access) { | 2524 if (contents && !allow_js_access) { |
2530 contents->web_contents()->GetController().LoadURL( | 2525 contents->web_contents()->GetController().LoadURL( |
2531 target_url, | 2526 target_url, |
2532 content::Referrer(), | 2527 content::Referrer(), |
2533 ui::PAGE_TRANSITION_LINK, | 2528 ui::PAGE_TRANSITION_LINK, |
2534 std::string()); // No extra headers. | 2529 std::string()); // No extra headers. |
2535 } | 2530 } |
2536 | 2531 |
2537 return contents != NULL; | 2532 return contents != NULL; |
2538 } | 2533 } |
OLD | NEW |