Chromium Code Reviews| 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 346 browser_->tabstrip_model()->RemoveObserver(this); | 346 browser_->tabstrip_model()->RemoveObserver(this); |
| 347 | 347 |
| 348 #if defined(OS_WIN) | 348 #if defined(OS_WIN) |
| 349 // Remove this observer. | 349 // Remove this observer. |
| 350 if (aeropeek_manager_.get()) | 350 if (aeropeek_manager_.get()) |
| 351 browser_->tabstrip_model()->RemoveObserver(aeropeek_manager_.get()); | 351 browser_->tabstrip_model()->RemoveObserver(aeropeek_manager_.get()); |
| 352 | 352 |
| 353 // Stop hung plugin monitoring. | 353 // Stop hung plugin monitoring. |
| 354 ticker_.Stop(); | 354 ticker_.Stop(); |
| 355 ticker_.UnregisterTickHandler(&hung_window_detector_); | 355 ticker_.UnregisterTickHandler(&hung_window_detector_); |
| 356 | |
| 357 if (JumpList::Enabled()) { | |
|
MAD
2011/08/16 17:02:31
Here, you should rely on jumplist_ not being NULL
| |
| 358 jumplist_->Terminate(); | |
| 359 } | |
| 356 #endif | 360 #endif |
| 357 | 361 |
| 358 #if !defined(OS_CHROMEOS) | 362 #if !defined(OS_CHROMEOS) |
| 359 // We destroy the download shelf before |browser_| to remove its child | 363 // We destroy the download shelf before |browser_| to remove its child |
| 360 // download views from the set of download observers (since the observed | 364 // download views from the set of download observers (since the observed |
| 361 // downloads can be destroyed along with |browser_| and the observer | 365 // downloads can be destroyed along with |browser_| and the observer |
| 362 // notifications will call back into deleted objects). | 366 // notifications will call back into deleted objects). |
| 363 download_shelf_.reset(); | 367 download_shelf_.reset(); |
| 364 #endif | 368 #endif |
| 365 | 369 |
| (...skipping 1629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1995 set_contents_view(contents_split_); | 1999 set_contents_view(contents_split_); |
| 1996 | 2000 |
| 1997 status_bubble_.reset(new StatusBubbleViews(contents_)); | 2001 status_bubble_.reset(new StatusBubbleViews(contents_)); |
| 1998 | 2002 |
| 1999 #if defined(OS_WIN) | 2003 #if defined(OS_WIN) |
| 2000 InitSystemMenu(); | 2004 InitSystemMenu(); |
| 2001 | 2005 |
| 2002 // Create a custom JumpList and add it to an observer of TabRestoreService | 2006 // Create a custom JumpList and add it to an observer of TabRestoreService |
| 2003 // so we can update the custom JumpList when a tab is added or removed. | 2007 // so we can update the custom JumpList when a tab is added or removed. |
| 2004 if (JumpList::Enabled()) { | 2008 if (JumpList::Enabled()) { |
| 2005 jumplist_.reset(new JumpList); | 2009 jumplist_ = new JumpList(); |
| 2006 jumplist_->AddObserver(browser_->profile()); | 2010 jumplist_->AddObserver(browser_->profile()); |
| 2007 } | 2011 } |
| 2008 | 2012 |
| 2009 if (AeroPeekManager::Enabled()) { | 2013 if (AeroPeekManager::Enabled()) { |
| 2010 aeropeek_manager_.reset(new AeroPeekManager( | 2014 aeropeek_manager_.reset(new AeroPeekManager( |
| 2011 frame_->GetNativeWindow())); | 2015 frame_->GetNativeWindow())); |
| 2012 browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get()); | 2016 browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get()); |
| 2013 } | 2017 } |
| 2014 #endif | 2018 #endif |
| 2015 // TODO(stevet): Remove all of this once we clean up compact navigation. Note | 2019 // TODO(stevet): Remove all of this once we clean up compact navigation. Note |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2664 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2668 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2665 // Create the view and the frame. The frame will attach itself via the view | 2669 // Create the view and the frame. The frame will attach itself via the view |
| 2666 // so we don't need to do anything with the pointer. | 2670 // so we don't need to do anything with the pointer. |
| 2667 BrowserView* view = new BrowserView(browser); | 2671 BrowserView* view = new BrowserView(browser); |
| 2668 (new BrowserFrame(view))->InitBrowserFrame(); | 2672 (new BrowserFrame(view))->InitBrowserFrame(); |
| 2669 view->GetWidget()->non_client_view()->SetAccessibleName( | 2673 view->GetWidget()->non_client_view()->SetAccessibleName( |
| 2670 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2674 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2671 return view; | 2675 return view; |
| 2672 } | 2676 } |
| 2673 #endif | 2677 #endif |
| OLD | NEW |