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

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

Issue 7466017: Fixes crash introduced by fix for 11229. The fix for 11229 made it so (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | « no previous file | views/widget/widget.h » ('j') | views/widget/widget.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1669 matching lines...) Expand 10 before | Expand all | Expand 10 after
1680 RenderViewHost* rvh = tab_contents->render_view_host(); 1680 RenderViewHost* rvh = tab_contents->render_view_host();
1681 rvh->Send(new ViewMsg_MoveOrResizeStarted(rvh->routing_id())); 1681 rvh->Send(new ViewMsg_MoveOrResizeStarted(rvh->routing_id()));
1682 } 1682 }
1683 1683
1684 void BrowserView::OnWidgetMove() { 1684 void BrowserView::OnWidgetMove() {
1685 // Cancel any tabstrip animations, some of them may be invalidated by the 1685 // Cancel any tabstrip animations, some of them may be invalidated by the
1686 // window being repositioned. 1686 // window being repositioned.
1687 // Comment out for one cycle to see if this fixes dist tests. 1687 // Comment out for one cycle to see if this fixes dist tests.
1688 // tabstrip_->DestroyDragController(); 1688 // tabstrip_->DestroyDragController();
1689 1689
1690 status_bubble_->Reposition(); 1690 if (status_bubble_.get())
1691 status_bubble_->Reposition();
1691 1692
1692 BrowserBubbleHost::WindowMoved(); 1693 BrowserBubbleHost::WindowMoved();
1693 1694
1694 browser::HideBookmarkBubbleView(); 1695 browser::HideBookmarkBubbleView();
1695 1696
1696 // Close the omnibox popup, if any. 1697 // Close the omnibox popup, if any.
1697 LocationBarView* location_bar_view = GetLocationBarView(); 1698 LocationBarView* location_bar_view = GetLocationBarView();
1698 if (location_bar_view) 1699 if (location_bar_view)
1699 location_bar_view->location_entry()->ClosePopup(); 1700 location_bar_view->location_entry()->ClosePopup();
1700 } 1701 }
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
2641 view->GetWidget()->non_client_view()->SetAccessibleName( 2642 view->GetWidget()->non_client_view()->SetAccessibleName(
2642 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 2643 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
2643 return view; 2644 return view;
2644 } 2645 }
2645 #endif 2646 #endif
2646 2647
2647 // static 2648 // static
2648 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2649 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2649 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2650 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2650 } 2651 }
OLDNEW
« no previous file with comments | « no previous file | views/widget/widget.h » ('j') | views/widget/widget.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698