OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/browser.h" | 5 #include "chrome/browser/browser.h" |
6 | 6 |
7 #include <commdlg.h> | 7 #include <commdlg.h> |
8 #include <shellapi.h> | 8 #include <shellapi.h> |
9 | 9 |
10 #include "base/file_version_info.h" | 10 #include "base/file_version_info.h" |
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
453 AddTabWithURL(url, PageTransition::LINK, true, NULL); | 453 AddTabWithURL(url, PageTransition::LINK, true, NULL); |
454 } | 454 } |
455 break; | 455 break; |
456 } | 456 } |
457 | 457 |
458 case IDC_SHOW_JS_CONSOLE: { | 458 case IDC_SHOW_JS_CONSOLE: { |
459 UserMetrics::RecordAction(L"ShowJSConsole", profile_); | 459 UserMetrics::RecordAction(L"ShowJSConsole", profile_); |
460 TabContents* current_tab = GetSelectedTabContents(); | 460 TabContents* current_tab = GetSelectedTabContents(); |
461 if (current_tab && current_tab->AsWebContents()) { | 461 if (current_tab && current_tab->AsWebContents()) { |
462 WebContents* wc = current_tab->AsWebContents(); | 462 WebContents* wc = current_tab->AsWebContents(); |
463 wc->ShowJavaScriptConsole(); | 463 wc->render_view_host()->ShowJavaScriptConsole(); |
464 } | 464 } |
465 break; | 465 break; |
466 } | 466 } |
467 | 467 |
468 case IDC_CREATE_SHORTCUT: { | 468 case IDC_CREATE_SHORTCUT: { |
469 UserMetrics::RecordAction(L"CreateShortcut", profile_); | 469 UserMetrics::RecordAction(L"CreateShortcut", profile_); |
470 WebContents* contents = this->GetSelectedTabContents()->AsWebContents(); | 470 WebContents* contents = this->GetSelectedTabContents()->AsWebContents(); |
471 if (contents) | 471 if (contents) |
472 contents->CreateShortcut(); | 472 contents->CreateShortcut(); |
473 break; | 473 break; |
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1070 | 1070 |
1071 //////////////////////////////////////////////////////////////////////////////// | 1071 //////////////////////////////////////////////////////////////////////////////// |
1072 // Browser, SelectFileDialog::Listener implementation: | 1072 // Browser, SelectFileDialog::Listener implementation: |
1073 | 1073 |
1074 void Browser::FileSelected(const std::wstring& path, void* params) { | 1074 void Browser::FileSelected(const std::wstring& path, void* params) { |
1075 GURL file_url = net::FilePathToFileURL(path); | 1075 GURL file_url = net::FilePathToFileURL(path); |
1076 if (!file_url.is_empty()) | 1076 if (!file_url.is_empty()) |
1077 OpenURL(file_url, CURRENT_TAB, PageTransition::TYPED); | 1077 OpenURL(file_url, CURRENT_TAB, PageTransition::TYPED); |
1078 } | 1078 } |
1079 | 1079 |
OLD | NEW |