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 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1615 void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) { | 1615 void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) { |
1616 if (web_contents == tab_strip_model_->GetActiveWebContents()) | 1616 if (web_contents == tab_strip_model_->GetActiveWebContents()) |
1617 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); | 1617 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); |
1618 } | 1618 } |
1619 | 1619 |
1620 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { | 1620 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { |
1621 if (web_contents == tab_strip_model_->GetActiveWebContents()) | 1621 if (web_contents == tab_strip_model_->GetActiveWebContents()) |
1622 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); | 1622 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); |
1623 } | 1623 } |
1624 | 1624 |
1625 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() { | 1625 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( |
| 1626 WebContents* source) { |
1626 return GetJavaScriptDialogManagerInstance(); | 1627 return GetJavaScriptDialogManagerInstance(); |
1627 } | 1628 } |
1628 | 1629 |
1629 content::ColorChooser* Browser::OpenColorChooser( | 1630 content::ColorChooser* Browser::OpenColorChooser( |
1630 WebContents* web_contents, | 1631 WebContents* web_contents, |
1631 SkColor initial_color, | 1632 SkColor initial_color, |
1632 const std::vector<content::ColorSuggestion>& suggestions) { | 1633 const std::vector<content::ColorSuggestion>& suggestions) { |
1633 return chrome::ShowColorChooser(web_contents, initial_color); | 1634 return chrome::ShowColorChooser(web_contents, initial_color); |
1634 } | 1635 } |
1635 | 1636 |
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2497 if (contents && !allow_js_access) { | 2498 if (contents && !allow_js_access) { |
2498 contents->web_contents()->GetController().LoadURL( | 2499 contents->web_contents()->GetController().LoadURL( |
2499 target_url, | 2500 target_url, |
2500 content::Referrer(), | 2501 content::Referrer(), |
2501 ui::PAGE_TRANSITION_LINK, | 2502 ui::PAGE_TRANSITION_LINK, |
2502 std::string()); // No extra headers. | 2503 std::string()); // No extra headers. |
2503 } | 2504 } |
2504 | 2505 |
2505 return contents != NULL; | 2506 return contents != NULL; |
2506 } | 2507 } |
OLD | NEW |