chrome/browser/ui/views/frame/browser_view_layout.cc - Issue 12298037: Revert 183123

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_layout.h"	5 #include "chrome/browser/ui/views/frame/browser_view_layout.h"

6	6

7 #include "chrome/browser/profiles/profile.h"

8 #include "chrome/browser/ui/browser_finder.h"	7 #include "chrome/browser/ui/browser_finder.h"

9 #include "chrome/browser/ui/find_bar/find_bar.h"	8 #include "chrome/browser/ui/find_bar/find_bar.h"

10 #include "chrome/browser/ui/find_bar/find_bar_controller.h"	9 #include "chrome/browser/ui/find_bar/find_bar_controller.h"

11 #include "chrome/browser/ui/search/search_model.h"	10 #include "chrome/browser/ui/search/search_model.h"

12 #include "chrome/browser/ui/view_ids.h"	11 #include "chrome/browser/ui/view_ids.h"

13 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"	12 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"

14 #include "chrome/browser/ui/views/download/download_shelf_view.h"	13 #include "chrome/browser/ui/views/download/download_shelf_view.h"

15 #include "chrome/browser/ui/views/frame/browser_frame.h"	14 #include "chrome/browser/ui/views/frame/browser_frame.h"

16 #include "chrome/browser/ui/views/frame/browser_view.h"	15 #include "chrome/browser/ui/views/frame/browser_view.h"

17 #include "chrome/browser/ui/views/frame/contents_container.h"	16 #include "chrome/browser/ui/views/frame/contents_container.h"

(...skipping 516 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
534 }	533 }

535 return bottom;	534 return bottom;

536 }	535 }

537	536

538 bool BrowserViewLayout::InfobarVisible() const {	537 bool BrowserViewLayout::InfobarVisible() const {

539 views::View* infobar_container = browser_view_->infobar_container_;	538 views::View* infobar_container = browser_view_->infobar_container_;

540 // NOTE: Can't check if the size IsEmpty() since it's always 0-width.	539 // NOTE: Can't check if the size IsEmpty() since it's always 0-width.

541 return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&	540 return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&

542 (infobar_container->GetPreferredSize().height() != 0);	541 (infobar_container->GetPreferredSize().height() != 0);

543 }	542 }

OLD	NEW