| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1907 InitHangMonitor(); | 1907 InitHangMonitor(); |
| 1908 } | 1908 } |
| 1909 | 1909 |
| 1910 LoadAccelerators(); | 1910 LoadAccelerators(); |
| 1911 | 1911 |
| 1912 infobar_container_ = new InfoBarContainerView(this); | 1912 infobar_container_ = new InfoBarContainerView(this); |
| 1913 AddChildView(infobar_container_); | 1913 AddChildView(infobar_container_); |
| 1914 | 1914 |
| 1915 contents_web_view_ = new ContentsWebView(browser_->profile()); | 1915 contents_web_view_ = new ContentsWebView(browser_->profile()); |
| 1916 contents_web_view_->set_id(VIEW_ID_TAB_CONTAINER); | 1916 contents_web_view_->set_id(VIEW_ID_TAB_CONTAINER); |
| 1917 contents_web_view_->SetEmbedFullscreenWidgetMode( | 1917 contents_web_view_->SetEmbedFullscreenWidgetMode(true); |
| 1918 implicit_cast<content::WebContentsDelegate*>(browser_.get())-> | |
| 1919 EmbedsFullscreenWidget()); | |
| 1920 | 1918 |
| 1921 web_contents_close_handler_.reset( | 1919 web_contents_close_handler_.reset( |
| 1922 new WebContentsCloseHandler(contents_web_view_)); | 1920 new WebContentsCloseHandler(contents_web_view_)); |
| 1923 | 1921 |
| 1924 devtools_web_view_ = new views::WebView(browser_->profile()); | 1922 devtools_web_view_ = new views::WebView(browser_->profile()); |
| 1925 devtools_web_view_->set_id(VIEW_ID_DEV_TOOLS_DOCKED); | 1923 devtools_web_view_->set_id(VIEW_ID_DEV_TOOLS_DOCKED); |
| 1926 devtools_web_view_->SetVisible(false); | 1924 devtools_web_view_->SetVisible(false); |
| 1927 | 1925 |
| 1928 contents_container_ = new views::View(); | 1926 contents_container_ = new views::View(); |
| 1929 contents_container_->set_background(views::Background::CreateSolidBackground( | 1927 contents_container_->set_background(views::Background::CreateSolidBackground( |
| (...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2536 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { | 2534 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { |
| 2537 gfx::Point icon_bottom( | 2535 gfx::Point icon_bottom( |
| 2538 toolbar_->location_bar()->GetLocationBarAnchorPoint()); | 2536 toolbar_->location_bar()->GetLocationBarAnchorPoint()); |
| 2539 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); | 2537 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); |
| 2540 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2538 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
| 2541 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2539 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
| 2542 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2540 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
| 2543 } | 2541 } |
| 2544 return top_arrow_height; | 2542 return top_arrow_height; |
| 2545 } | 2543 } |
| OLD | NEW |