| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #if defined(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 1969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1980 set_contents_view(contents_split_); | 1980 set_contents_view(contents_split_); |
| 1981 | 1981 |
| 1982 status_bubble_.reset(new StatusBubbleViews(contents_)); | 1982 status_bubble_.reset(new StatusBubbleViews(contents_)); |
| 1983 | 1983 |
| 1984 #if defined(OS_WIN) | 1984 #if defined(OS_WIN) |
| 1985 InitSystemMenu(); | 1985 InitSystemMenu(); |
| 1986 | 1986 |
| 1987 // Create a custom JumpList and add it to an observer of TabRestoreService | 1987 // Create a custom JumpList and add it to an observer of TabRestoreService |
| 1988 // so we can update the custom JumpList when a tab is added or removed. | 1988 // so we can update the custom JumpList when a tab is added or removed. |
| 1989 if (JumpList::Enabled()) { | 1989 if (JumpList::Enabled()) { |
| 1990 jumplist_.reset(new JumpList); | 1990 jumplist_ = new JumpList(); |
| 1991 jumplist_->AddObserver(browser_->profile()); | 1991 jumplist_->AddObserver(browser_->profile()); |
| 1992 } | 1992 } |
| 1993 | 1993 |
| 1994 if (AeroPeekManager::Enabled()) { | 1994 if (AeroPeekManager::Enabled()) { |
| 1995 aeropeek_manager_.reset(new AeroPeekManager( | 1995 aeropeek_manager_.reset(new AeroPeekManager( |
| 1996 frame_->GetNativeWindow())); | 1996 frame_->GetNativeWindow())); |
| 1997 browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get()); | 1997 browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get()); |
| 1998 } | 1998 } |
| 1999 #endif | 1999 #endif |
| 2000 // TODO(stevet): Remove all of this once we clean up compact navigation. Note | 2000 // TODO(stevet): Remove all of this once we clean up compact navigation. Note |
| (...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2657 view->GetWidget()->non_client_view()->SetAccessibleName( | 2657 view->GetWidget()->non_client_view()->SetAccessibleName( |
| 2658 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2658 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2659 return view; | 2659 return view; |
| 2660 } | 2660 } |
| 2661 #endif | 2661 #endif |
| 2662 | 2662 |
| 2663 // static | 2663 // static |
| 2664 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2664 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2665 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2665 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2666 } | 2666 } |
| OLD | NEW |