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 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1580 | 1580 |
1581 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { | 1581 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { |
1582 if (web_contents == tab_strip_model_->GetActiveWebContents()) | 1582 if (web_contents == tab_strip_model_->GetActiveWebContents()) |
1583 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); | 1583 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); |
1584 } | 1584 } |
1585 | 1585 |
1586 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() { | 1586 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() { |
1587 return GetJavaScriptDialogManagerInstance(); | 1587 return GetJavaScriptDialogManagerInstance(); |
1588 } | 1588 } |
1589 | 1589 |
1590 content::ColorChooser* Browser::OpenColorChooser(WebContents* web_contents, | 1590 content::ColorChooser* Browser::OpenColorChooser( |
1591 SkColor initial_color) { | 1591 WebContents* web_contents, |
| 1592 SkColor initial_color, |
| 1593 const std::vector<SkColor>& suggestions, |
| 1594 const std::vector<string16>& suggestion_labels) { |
1592 return chrome::ShowColorChooser(web_contents, initial_color); | 1595 return chrome::ShowColorChooser(web_contents, initial_color); |
1593 } | 1596 } |
1594 | 1597 |
1595 void Browser::RunFileChooser(WebContents* web_contents, | 1598 void Browser::RunFileChooser(WebContents* web_contents, |
1596 const content::FileChooserParams& params) { | 1599 const content::FileChooserParams& params) { |
1597 FileSelectHelper::RunFileChooser(web_contents, params); | 1600 FileSelectHelper::RunFileChooser(web_contents, params); |
1598 } | 1601 } |
1599 | 1602 |
1600 void Browser::EnumerateDirectory(WebContents* web_contents, | 1603 void Browser::EnumerateDirectory(WebContents* web_contents, |
1601 int request_id, | 1604 int request_id, |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2280 if (contents && !allow_js_access) { | 2283 if (contents && !allow_js_access) { |
2281 contents->web_contents()->GetController().LoadURL( | 2284 contents->web_contents()->GetController().LoadURL( |
2282 target_url, | 2285 target_url, |
2283 content::Referrer(), | 2286 content::Referrer(), |
2284 content::PAGE_TRANSITION_LINK, | 2287 content::PAGE_TRANSITION_LINK, |
2285 std::string()); // No extra headers. | 2288 std::string()); // No extra headers. |
2286 } | 2289 } |
2287 | 2290 |
2288 return contents != NULL; | 2291 return contents != NULL; |
2289 } | 2292 } |
OLD | NEW |