| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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/views/frame/browser_view.h" | 5 #include "chrome/browser/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_version_info.h" | 8 #include "base/file_version_info.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "chrome/app/chrome_dll_resource.h" | 10 #include "chrome/app/chrome_dll_resource.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "chrome/browser/views/clear_browsing_data.h" | 24 #include "chrome/browser/views/clear_browsing_data.h" |
| 25 #include "chrome/browser/views/download_shelf_view.h" | 25 #include "chrome/browser/views/download_shelf_view.h" |
| 26 #include "chrome/browser/views/find_bar_win.h" | 26 #include "chrome/browser/views/find_bar_win.h" |
| 27 #include "chrome/browser/views/frame/browser_frame.h" | 27 #include "chrome/browser/views/frame/browser_frame.h" |
| 28 #include "chrome/browser/views/fullscreen_exit_bubble.h" | 28 #include "chrome/browser/views/fullscreen_exit_bubble.h" |
| 29 #include "chrome/browser/views/html_dialog_view.h" | 29 #include "chrome/browser/views/html_dialog_view.h" |
| 30 #include "chrome/browser/views/importer_view.h" | 30 #include "chrome/browser/views/importer_view.h" |
| 31 #include "chrome/browser/views/infobars/infobar_container.h" | 31 #include "chrome/browser/views/infobars/infobar_container.h" |
| 32 #include "chrome/browser/views/keyword_editor_view.h" | 32 #include "chrome/browser/views/keyword_editor_view.h" |
| 33 #include "chrome/browser/views/new_profile_dialog.h" | 33 #include "chrome/browser/views/new_profile_dialog.h" |
| 34 #include "chrome/browser/views/password_manager_view.h" | 34 #include "chrome/browser/views/options/passwords_exceptions_window_view.h" |
| 35 #include "chrome/browser/views/select_profile_dialog.h" | 35 #include "chrome/browser/views/select_profile_dialog.h" |
| 36 #include "chrome/browser/views/status_bubble_views.h" | 36 #include "chrome/browser/views/status_bubble_views.h" |
| 37 #include "chrome/browser/views/tab_contents_container_view.h" | 37 #include "chrome/browser/views/tab_contents_container_view.h" |
| 38 #include "chrome/browser/views/tabs/tab_strip.h" | 38 #include "chrome/browser/views/tabs/tab_strip.h" |
| 39 #include "chrome/browser/views/toolbar_star_toggle.h" | 39 #include "chrome/browser/views/toolbar_star_toggle.h" |
| 40 #include "chrome/browser/views/toolbar_view.h" | 40 #include "chrome/browser/views/toolbar_view.h" |
| 41 #include "chrome/browser/sessions/tab_restore_service.h" | 41 #include "chrome/browser/sessions/tab_restore_service.h" |
| 42 #include "chrome/browser/tab_contents/navigation_entry.h" | 42 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 43 #include "chrome/browser/tab_contents/web_contents.h" | 43 #include "chrome/browser/tab_contents/web_contents.h" |
| 44 #include "chrome/browser/tab_contents/web_contents_view.h" | 44 #include "chrome/browser/tab_contents/web_contents_view.h" |
| (...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 871 views::Window::CreateChromeWindow( | 871 views::Window::CreateChromeWindow( |
| 872 GetWidget()->GetNativeView(), gfx::Rect(), | 872 GetWidget()->GetNativeView(), gfx::Rect(), |
| 873 new ImporterView(browser_->profile()))->Show(); | 873 new ImporterView(browser_->profile()))->Show(); |
| 874 } | 874 } |
| 875 | 875 |
| 876 void BrowserView::ShowSearchEnginesDialog() { | 876 void BrowserView::ShowSearchEnginesDialog() { |
| 877 KeywordEditorView::Show(browser_->profile()); | 877 KeywordEditorView::Show(browser_->profile()); |
| 878 } | 878 } |
| 879 | 879 |
| 880 void BrowserView::ShowPasswordManager() { | 880 void BrowserView::ShowPasswordManager() { |
| 881 PasswordManagerView::Show(browser_->profile()); | 881 PasswordsExceptionsWindowView::Show(browser_->profile()); |
| 882 } | 882 } |
| 883 | 883 |
| 884 void BrowserView::ShowSelectProfileDialog() { | 884 void BrowserView::ShowSelectProfileDialog() { |
| 885 SelectProfileDialog::RunDialog(); | 885 SelectProfileDialog::RunDialog(); |
| 886 } | 886 } |
| 887 | 887 |
| 888 void BrowserView::ShowNewProfileDialog() { | 888 void BrowserView::ShowNewProfileDialog() { |
| 889 NewProfileDialog::RunDialog(); | 889 NewProfileDialog::RunDialog(); |
| 890 } | 890 } |
| 891 | 891 |
| (...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1681 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 1681 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 1682 BrowserView* browser_view = new BrowserView(browser); | 1682 BrowserView* browser_view = new BrowserView(browser); |
| 1683 (new BrowserFrame(browser_view))->Init(); | 1683 (new BrowserFrame(browser_view))->Init(); |
| 1684 return browser_view; | 1684 return browser_view; |
| 1685 } | 1685 } |
| 1686 | 1686 |
| 1687 // static | 1687 // static |
| 1688 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 1688 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 1689 return new FindBarWin(static_cast<BrowserView*>(browser->window())); | 1689 return new FindBarWin(static_cast<BrowserView*>(browser->window())); |
| 1690 } | 1690 } |
| OLD | NEW |