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

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

Issue 6609047: [linux_views][Win] spoof proof redesign infobar extension with tab. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: renames, don't const_cast, ditch InfoBarView::VerticalOffset. Created 9 years, 9 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
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(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1763 matching lines...) Expand 10 before | Expand all | Expand 10 after
1774 gfx::Insets insets(GetFindBarBoundingBox().y() + 1, 1774 gfx::Insets insets(GetFindBarBoundingBox().y() + 1,
1775 0, 1775 0,
1776 0, 1776 0,
1777 0); 1777 0);
1778 aeropeek_manager_->SetContentInsets(insets); 1778 aeropeek_manager_->SetContentInsets(insets);
1779 } 1779 }
1780 #endif 1780 #endif
1781 } 1781 }
1782 1782
1783 void BrowserView::PaintChildren(gfx::Canvas* canvas) { 1783 void BrowserView::PaintChildren(gfx::Canvas* canvas) {
1784 views::ClientView::PaintChildren(canvas); 1784 // Paint the |infobar_container_| last so that it may paint its
1785 // overlapping tabs.
1786 for (int i = 0; i < child_count(); ++i) {
1787 View* child = GetChildViewAt(i);
1788 if (child != infobar_container_)
1789 child->Paint(canvas);
1790 }
1785 1791
1786 infobar_container_->PaintInfoBarArrows(canvas->AsCanvasSkia(), 1792 infobar_container_->Paint(canvas);
1787 this,
1788 GetInfoBarArrowCenterX());
1789 } 1793 }
1790 1794
1791 void BrowserView::ViewHierarchyChanged(bool is_add, 1795 void BrowserView::ViewHierarchyChanged(bool is_add,
1792 views::View* parent, 1796 views::View* parent,
1793 views::View* child) { 1797 views::View* child) {
1794 if (is_add && child == this && GetWidget() && !initialized_) { 1798 if (is_add && child == this && GetWidget() && !initialized_) {
1795 Init(); 1799 Init();
1796 initialized_ = true; 1800 initialized_ = true;
1797 } 1801 }
1798 } 1802 }
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
2548 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 2552 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
2549 2553
2550 return view; 2554 return view;
2551 } 2555 }
2552 #endif 2556 #endif
2553 2557
2554 // static 2558 // static
2555 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2559 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2556 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2560 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2557 } 2561 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view_layout.cc » ('j') | chrome/browser/ui/views/infobars/infobar_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698