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 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <string> | 10 #include <string> |
(...skipping 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1676 return app_modal::JavaScriptDialogManager::GetInstance(); | 1676 return app_modal::JavaScriptDialogManager::GetInstance(); |
1677 } | 1677 } |
1678 | 1678 |
1679 content::ColorChooser* Browser::OpenColorChooser( | 1679 content::ColorChooser* Browser::OpenColorChooser( |
1680 WebContents* web_contents, | 1680 WebContents* web_contents, |
1681 SkColor initial_color, | 1681 SkColor initial_color, |
1682 const std::vector<content::ColorSuggestion>& suggestions) { | 1682 const std::vector<content::ColorSuggestion>& suggestions) { |
1683 return chrome::ShowColorChooser(web_contents, initial_color); | 1683 return chrome::ShowColorChooser(web_contents, initial_color); |
1684 } | 1684 } |
1685 | 1685 |
1686 void Browser::RunFileChooser(WebContents* web_contents, | 1686 void Browser::RunFileChooser(content::RenderFrameHost* render_frame_host, |
1687 const content::FileChooserParams& params) { | 1687 const content::FileChooserParams& params) { |
1688 FileSelectHelper::RunFileChooser(web_contents, params); | 1688 FileSelectHelper::RunFileChooser(render_frame_host, params); |
1689 } | 1689 } |
1690 | 1690 |
1691 void Browser::EnumerateDirectory(WebContents* web_contents, | 1691 void Browser::EnumerateDirectory(WebContents* web_contents, |
1692 int request_id, | 1692 int request_id, |
1693 const base::FilePath& path) { | 1693 const base::FilePath& path) { |
1694 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path); | 1694 FileSelectHelper::EnumerateDirectory(web_contents, request_id, path); |
1695 } | 1695 } |
1696 | 1696 |
1697 bool Browser::EmbedsFullscreenWidget() const { | 1697 bool Browser::EmbedsFullscreenWidget() const { |
1698 return true; | 1698 return true; |
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2598 if (contents && !allow_js_access) { | 2598 if (contents && !allow_js_access) { |
2599 contents->web_contents()->GetController().LoadURL( | 2599 contents->web_contents()->GetController().LoadURL( |
2600 target_url, | 2600 target_url, |
2601 content::Referrer(), | 2601 content::Referrer(), |
2602 ui::PAGE_TRANSITION_LINK, | 2602 ui::PAGE_TRANSITION_LINK, |
2603 std::string()); // No extra headers. | 2603 std::string()); // No extra headers. |
2604 } | 2604 } |
2605 | 2605 |
2606 return contents != NULL; | 2606 return contents != NULL; |
2607 } | 2607 } |
OLD | NEW |