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

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

Issue 7492005: Fixes crash on startup with compact nav. A recent change meant it's (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 | 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) 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 1353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 #endif 1364 #endif
1365 1365
1366 /////////////////////////////////////////////////////////////////////////////// 1366 ///////////////////////////////////////////////////////////////////////////////
1367 // BrowserView, BrowserWindowTesting implementation: 1367 // BrowserView, BrowserWindowTesting implementation:
1368 1368
1369 BookmarkBarView* BrowserView::GetBookmarkBarView() const { 1369 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
1370 return bookmark_bar_view_.get(); 1370 return bookmark_bar_view_.get();
1371 } 1371 }
1372 1372
1373 LocationBarView* BrowserView::GetLocationBarView() const { 1373 LocationBarView* BrowserView::GetLocationBarView() const {
1374 if (UseCompactNavigationBar()) { 1374 if (UseCompactNavigationBar() && compact_location_bar_view_host_.get()) {
1375 return compact_location_bar_view_host_->GetCompactLocationBarView()-> 1375 return compact_location_bar_view_host_->GetCompactLocationBarView()->
1376 location_bar_view(); 1376 location_bar_view();
1377 } else { 1377 } else {
1378 return toolbar_ ? toolbar_->location_bar() : NULL; 1378 return toolbar_ ? toolbar_->location_bar() : NULL;
1379 } 1379 }
1380 } 1380 }
1381 1381
1382 views::View* BrowserView::GetTabContentsContainerView() const { 1382 views::View* BrowserView::GetTabContentsContainerView() const {
1383 return contents_container_->GetFocusView(); 1383 return contents_container_->GetFocusView();
1384 } 1384 }
(...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after
2643 view->GetWidget()->non_client_view()->SetAccessibleName( 2643 view->GetWidget()->non_client_view()->SetAccessibleName(
2644 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 2644 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
2645 return view; 2645 return view;
2646 } 2646 }
2647 #endif 2647 #endif
2648 2648
2649 // static 2649 // static
2650 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2650 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2651 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2651 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2652 } 2652 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698