| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 1787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1798 void Browser::FileSelectedWithExtraInfo( | 1798 void Browser::FileSelectedWithExtraInfo( |
| 1799 const ui::SelectedFileInfo& file_info, | 1799 const ui::SelectedFileInfo& file_info, |
| 1800 int index, | 1800 int index, |
| 1801 void* params) { | 1801 void* params) { |
| 1802 profile_->set_last_selected_directory(file_info.file_path.DirName()); | 1802 profile_->set_last_selected_directory(file_info.file_path.DirName()); |
| 1803 | 1803 |
| 1804 const FilePath& path = file_info.local_path; | 1804 const FilePath& path = file_info.local_path; |
| 1805 GURL file_url = net::FilePathToFileURL(path); | 1805 GURL file_url = net::FilePathToFileURL(path); |
| 1806 | 1806 |
| 1807 #if defined(OS_CHROMEOS) | 1807 #if defined(OS_CHROMEOS) |
| 1808 gdata::util::ModifyDriveFileResourceUrl(profile_, path, &file_url); | 1808 drive::util::ModifyDriveFileResourceUrl(profile_, path, &file_url); |
| 1809 #endif | 1809 #endif |
| 1810 | 1810 |
| 1811 if (file_url.is_empty()) | 1811 if (file_url.is_empty()) |
| 1812 return; | 1812 return; |
| 1813 | 1813 |
| 1814 OpenURL(OpenURLParams( | 1814 OpenURL(OpenURLParams( |
| 1815 file_url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, | 1815 file_url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, |
| 1816 false)); | 1816 false)); |
| 1817 } | 1817 } |
| 1818 | 1818 |
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2313 if (contents && !allow_js_access) { | 2313 if (contents && !allow_js_access) { |
| 2314 contents->web_contents()->GetController().LoadURL( | 2314 contents->web_contents()->GetController().LoadURL( |
| 2315 target_url, | 2315 target_url, |
| 2316 content::Referrer(), | 2316 content::Referrer(), |
| 2317 content::PAGE_TRANSITION_LINK, | 2317 content::PAGE_TRANSITION_LINK, |
| 2318 std::string()); // No extra headers. | 2318 std::string()); // No extra headers. |
| 2319 } | 2319 } |
| 2320 | 2320 |
| 2321 return contents != NULL; | 2321 return contents != NULL; |
| 2322 } | 2322 } |
| OLD | NEW |