| 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" |
| (...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 961 | 961 |
| 962 bool BrowserView::IsModal() const { | 962 bool BrowserView::IsModal() const { |
| 963 return false; | 963 return false; |
| 964 } | 964 } |
| 965 | 965 |
| 966 std::wstring BrowserView::GetWindowTitle() const { | 966 std::wstring BrowserView::GetWindowTitle() const { |
| 967 return browser_->GetCurrentPageTitle(); | 967 return browser_->GetCurrentPageTitle(); |
| 968 } | 968 } |
| 969 | 969 |
| 970 views::View* BrowserView::GetInitiallyFocusedView() { | 970 views::View* BrowserView::GetInitiallyFocusedView() { |
| 971 return toolbar_->GetLocationBarView(); | 971 // We set the frame not focus on creation so this should never be called. |
| 972 NOTREACHED(); |
| 973 return NULL; |
| 972 } | 974 } |
| 973 | 975 |
| 974 bool BrowserView::ShouldShowWindowTitle() const { | 976 bool BrowserView::ShouldShowWindowTitle() const { |
| 975 return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR); | 977 return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR); |
| 976 } | 978 } |
| 977 | 979 |
| 978 SkBitmap BrowserView::GetWindowIcon() { | 980 SkBitmap BrowserView::GetWindowIcon() { |
| 979 if (browser_->type() & Browser::TYPE_APP) | 981 if (browser_->type() & Browser::TYPE_APP) |
| 980 return browser_->GetCurrentPageIcon(); | 982 return browser_->GetCurrentPageIcon(); |
| 981 return SkBitmap(); | 983 return SkBitmap(); |
| (...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1657 } | 1659 } |
| 1658 } | 1660 } |
| 1659 | 1661 |
| 1660 // static | 1662 // static |
| 1661 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 1663 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 1662 BrowserView* browser_view = new BrowserView(browser); | 1664 BrowserView* browser_view = new BrowserView(browser); |
| 1663 (new BrowserFrame(browser_view))->Init(); | 1665 (new BrowserFrame(browser_view))->Init(); |
| 1664 return browser_view; | 1666 return browser_view; |
| 1665 } | 1667 } |
| 1666 | 1668 |
| OLD | NEW |