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

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

Issue 28162: Fix 8063: Find-in-page remains open on History/Downloads page... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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/views/find_bar_win_uitest.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-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 "base/command_line.h" 5 #include "base/command_line.h"
6 6
7 #include "chrome/browser/views/frame/browser_view.h" 7 #include "chrome/browser/views/frame/browser_view.h"
8 8
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 !browser_->tabstrip_model()->closing_all()) { 926 !browser_->tabstrip_model()->closing_all()) {
927 new_contents->RestoreFocus(); 927 new_contents->RestoreFocus();
928 } 928 }
929 929
930 // Update all the UI bits. 930 // Update all the UI bits.
931 UpdateTitleBar(); 931 UpdateTitleBar();
932 toolbar_->SetProfile(new_contents->profile()); 932 toolbar_->SetProfile(new_contents->profile());
933 UpdateToolbar(new_contents, true); 933 UpdateToolbar(new_contents, true);
934 UpdateUIForContents(new_contents); 934 UpdateUIForContents(new_contents);
935 935
936 if (find_bar_.get() && new_contents->AsWebContents()) 936 if (find_bar_.get())
937 find_bar_->ChangeWebContents(new_contents->AsWebContents()); 937 find_bar_->ChangeWebContents(new_contents->AsWebContents());
938 } 938 }
939 939
940 void BrowserView::TabStripEmpty() { 940 void BrowserView::TabStripEmpty() {
941 // Make sure all optional UI is removed before we are destroyed, otherwise 941 // Make sure all optional UI is removed before we are destroyed, otherwise
942 // there will be consequences (since our view hierarchy will still have 942 // there will be consequences (since our view hierarchy will still have
943 // references to freed views). 943 // references to freed views).
944 UpdateUIForContents(NULL); 944 UpdateUIForContents(NULL);
945 } 945 }
946 946
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
1642 1642
1643 // static 1643 // static
1644 void BrowserView::InitClass() { 1644 void BrowserView::InitClass() {
1645 static bool initialized = false; 1645 static bool initialized = false;
1646 if (!initialized) { 1646 if (!initialized) {
1647 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 1647 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
1648 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); 1648 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
1649 initialized = true; 1649 initialized = true;
1650 } 1650 }
1651 } 1651 }
OLDNEW
« no previous file with comments | « chrome/browser/views/find_bar_win_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698