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 1548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1559 | 1559 |
1560 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { | 1560 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { |
1561 if (web_contents == tab_strip_model_->GetActiveWebContents()) | 1561 if (web_contents == tab_strip_model_->GetActiveWebContents()) |
1562 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); | 1562 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); |
1563 } | 1563 } |
1564 | 1564 |
1565 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() { | 1565 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() { |
1566 return GetJavaScriptDialogManagerInstance(); | 1566 return GetJavaScriptDialogManagerInstance(); |
1567 } | 1567 } |
1568 | 1568 |
1569 content::ColorChooser* Browser::OpenColorChooser(WebContents* web_contents, | 1569 content::ColorChooser* Browser::OpenColorChooser( |
1570 SkColor initial_color) { | 1570 WebContents* web_contents, |
| 1571 SkColor initial_color, |
| 1572 const std::vector<SkColor>& suggestions, |
| 1573 const std::vector<string16>& suggestion_labels) { |
1571 return chrome::ShowColorChooser(web_contents, initial_color); | 1574 return chrome::ShowColorChooser(web_contents, initial_color); |
1572 } | 1575 } |
1573 | 1576 |
1574 void Browser::RunFileChooser(WebContents* web_contents, | 1577 void Browser::RunFileChooser(WebContents* web_contents, |
1575 const content::FileChooserParams& params) { | 1578 const content::FileChooserParams& params) { |
1576 FileSelectHelper::RunFileChooser(web_contents, params); | 1579 FileSelectHelper::RunFileChooser(web_contents, params); |
1577 } | 1580 } |
1578 | 1581 |
1579 void Browser::EnumerateDirectory(WebContents* web_contents, | 1582 void Browser::EnumerateDirectory(WebContents* web_contents, |
1580 int request_id, | 1583 int request_id, |
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2248 if (contents && !allow_js_access) { | 2251 if (contents && !allow_js_access) { |
2249 contents->web_contents()->GetController().LoadURL( | 2252 contents->web_contents()->GetController().LoadURL( |
2250 target_url, | 2253 target_url, |
2251 content::Referrer(), | 2254 content::Referrer(), |
2252 content::PAGE_TRANSITION_LINK, | 2255 content::PAGE_TRANSITION_LINK, |
2253 std::string()); // No extra headers. | 2256 std::string()); // No extra headers. |
2254 } | 2257 } |
2255 | 2258 |
2256 return contents != NULL; | 2259 return contents != NULL; |
2257 } | 2260 } |
OLD | NEW |