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/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" |
11 #include "chrome/browser/app_modal_dialog_queue.h" | 11 #include "chrome/browser/app_modal_dialog_queue.h" |
| 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
12 #include "chrome/browser/browser.h" | 13 #include "chrome/browser/browser.h" |
13 #include "chrome/browser/browser_list.h" | 14 #include "chrome/browser/browser_list.h" |
14 #include "chrome/browser/encoding_menu_controller_delegate.h" | 15 #include "chrome/browser/encoding_menu_controller_delegate.h" |
15 #include "chrome/browser/find_bar_controller.h" | 16 #include "chrome/browser/find_bar_controller.h" |
16 #include "chrome/browser/view_ids.h" | 17 #include "chrome/browser/view_ids.h" |
17 #include "chrome/browser/views/about_chrome_view.h" | 18 #include "chrome/browser/views/about_chrome_view.h" |
18 #include "chrome/browser/views/bookmark_bar_view.h" | 19 #include "chrome/browser/views/bookmark_bar_view.h" |
19 #include "chrome/browser/views/bookmark_bubble_view.h" | 20 #include "chrome/browser/views/bookmark_bubble_view.h" |
20 #include "chrome/browser/views/bookmark_manager_view.h" | 21 #include "chrome/browser/views/bookmark_manager_view.h" |
21 #include "chrome/browser/views/bug_report_view.h" | 22 #include "chrome/browser/views/bug_report_view.h" |
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
774 x = 0; | 775 x = 0; |
775 return gfx::Rect(x, client_rect.height() - resize_corner_size.height(), | 776 return gfx::Rect(x, client_rect.height() - resize_corner_size.height(), |
776 resize_corner_size.width(), resize_corner_size.height()); | 777 resize_corner_size.width(), resize_corner_size.height()); |
777 } | 778 } |
778 | 779 |
779 void BrowserView::DisableInactiveFrame() { | 780 void BrowserView::DisableInactiveFrame() { |
780 frame_->DisableInactiveRendering(); | 781 frame_->DisableInactiveRendering(); |
781 } | 782 } |
782 | 783 |
783 void BrowserView::ToggleBookmarkBar() { | 784 void BrowserView::ToggleBookmarkBar() { |
784 BookmarkBarView::ToggleWhenVisible(browser_->profile()); | 785 bookmark_utils::ToggleWhenVisible(browser_->profile()); |
785 } | 786 } |
786 | 787 |
787 void BrowserView::ShowFindBar() { | 788 void BrowserView::ShowFindBar() { |
788 find_bar_controller_->Show(); | 789 find_bar_controller_->Show(); |
789 } | 790 } |
790 | 791 |
791 void BrowserView::ShowAboutChromeDialog() { | 792 void BrowserView::ShowAboutChromeDialog() { |
792 views::Window::CreateChromeWindow( | 793 views::Window::CreateChromeWindow( |
793 GetWidget()->GetNativeView(), gfx::Rect(), | 794 GetWidget()->GetNativeView(), gfx::Rect(), |
794 new AboutChromeView(browser_->profile()))->Show(); | 795 new AboutChromeView(browser_->profile()))->Show(); |
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1629 initialized = true; | 1630 initialized = true; |
1630 } | 1631 } |
1631 } | 1632 } |
1632 | 1633 |
1633 // static | 1634 // static |
1634 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 1635 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
1635 BrowserView* browser_view = new BrowserView(browser); | 1636 BrowserView* browser_view = new BrowserView(browser); |
1636 (new BrowserFrame(browser_view))->Init(); | 1637 (new BrowserFrame(browser_view))->Init(); |
1637 return browser_view; | 1638 return browser_view; |
1638 } | 1639 } |
OLD | NEW |