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

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

Issue 151061: Regression: task manager icon for chrome is blank... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1792 static bool initialized = false; 1792 static bool initialized = false;
1793 if (!initialized) { 1793 if (!initialized) {
1794 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 1794 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
1795 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); 1795 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
1796 initialized = true; 1796 initialized = true;
1797 } 1797 }
1798 } 1798 }
1799 1799
1800 // static 1800 // static
1801 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 1801 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
1802 if (!views::ViewsDelegate::views_delegate)
1803 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
1804
1805 // Create the view and the frame. The frame will attach itself via the view 1802 // Create the view and the frame. The frame will attach itself via the view
1806 // so we don't need to do anything with the pointer. 1803 // so we don't need to do anything with the pointer.
1807 BrowserView* view = new BrowserView(browser); 1804 BrowserView* view = new BrowserView(browser);
1808 BrowserFrame::Create(view, browser->profile()); 1805 BrowserFrame::Create(view, browser->profile());
1809 return view; 1806 return view;
1810 } 1807 }
1811 1808
1812 // static 1809 // static
1813 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 1810 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
1814 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 1811 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
1815 } 1812 }
1816 1813
1817 // static 1814 // static
1818 void BrowserList::AllBrowsersClosed() { 1815 void BrowserList::AllBrowsersClosed() {
1819 views::Window::CloseAllSecondaryWindows(); 1816 views::Window::CloseAllSecondaryWindows();
1820 } 1817 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698