Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 7538022: Jumplist Bug (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1995 set_contents_view(contents_split_); 1995 set_contents_view(contents_split_);
1996 1996
1997 status_bubble_.reset(new StatusBubbleViews(contents_)); 1997 status_bubble_.reset(new StatusBubbleViews(contents_));
1998 1998
1999 #if defined(OS_WIN) 1999 #if defined(OS_WIN)
2000 InitSystemMenu(); 2000 InitSystemMenu();
2001 2001
2002 // Create a custom JumpList and add it to an observer of TabRestoreService 2002 // 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. 2003 // so we can update the custom JumpList when a tab is added or removed.
2004 if (JumpList::Enabled()) { 2004 if (JumpList::Enabled()) {
2005 jumplist_.reset(new JumpList); 2005 jumplist_ = new JumpList();
2006 jumplist_->AddObserver(browser_->profile()); 2006 jumplist_->AddObserver(browser_->profile());
2007 } 2007 }
2008 2008
2009 if (AeroPeekManager::Enabled()) { 2009 if (AeroPeekManager::Enabled()) {
2010 aeropeek_manager_.reset(new AeroPeekManager( 2010 aeropeek_manager_.reset(new AeroPeekManager(
2011 frame_->GetNativeWindow())); 2011 frame_->GetNativeWindow()));
2012 browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get()); 2012 browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get());
2013 } 2013 }
2014 #endif 2014 #endif
2015 // TODO(stevet): Remove all of this once we clean up compact navigation. Note 2015 // 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
2664 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 2664 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
2665 // Create the view and the frame. The frame will attach itself via the view 2665 // 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. 2666 // so we don't need to do anything with the pointer.
2667 BrowserView* view = new BrowserView(browser); 2667 BrowserView* view = new BrowserView(browser);
2668 (new BrowserFrame(view))->InitBrowserFrame(); 2668 (new BrowserFrame(view))->InitBrowserFrame();
2669 view->GetWidget()->non_client_view()->SetAccessibleName( 2669 view->GetWidget()->non_client_view()->SetAccessibleName(
2670 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 2670 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
2671 return view; 2671 return view;
2672 } 2672 }
2673 #endif 2673 #endif
OLDNEW
« chrome/browser/jumplist_win.cc ('K') | « chrome/browser/ui/views/frame/browser_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698