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

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

Issue 386463002: Remove --disable-fullscreen-within-tab command-line flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
OLDNEW
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 1895 matching lines...) Expand 10 before | Expand all | Expand 10 after
1906 InitHangMonitor(); 1906 InitHangMonitor();
1907 } 1907 }
1908 1908
1909 LoadAccelerators(); 1909 LoadAccelerators();
1910 1910
1911 infobar_container_ = new InfoBarContainerView(this); 1911 infobar_container_ = new InfoBarContainerView(this);
1912 AddChildView(infobar_container_); 1912 AddChildView(infobar_container_);
1913 1913
1914 contents_web_view_ = new ContentsWebView(browser_->profile()); 1914 contents_web_view_ = new ContentsWebView(browser_->profile());
1915 contents_web_view_->set_id(VIEW_ID_TAB_CONTAINER); 1915 contents_web_view_->set_id(VIEW_ID_TAB_CONTAINER);
1916 contents_web_view_->SetEmbedFullscreenWidgetMode( 1916 contents_web_view_->SetEmbedFullscreenWidgetMode(true);
1917 implicit_cast<content::WebContentsDelegate*>(browser_.get())->
1918 EmbedsFullscreenWidget());
1919 1917
1920 web_contents_close_handler_.reset( 1918 web_contents_close_handler_.reset(
1921 new WebContentsCloseHandler(contents_web_view_)); 1919 new WebContentsCloseHandler(contents_web_view_));
1922 1920
1923 devtools_web_view_ = new views::WebView(browser_->profile()); 1921 devtools_web_view_ = new views::WebView(browser_->profile());
1924 devtools_web_view_->set_id(VIEW_ID_DEV_TOOLS_DOCKED); 1922 devtools_web_view_->set_id(VIEW_ID_DEV_TOOLS_DOCKED);
1925 devtools_web_view_->SetVisible(false); 1923 devtools_web_view_->SetVisible(false);
1926 1924
1927 contents_container_ = new views::View(); 1925 contents_container_ = new views::View();
1928 contents_container_->set_background(views::Background::CreateSolidBackground( 1926 contents_container_->set_background(views::Background::CreateSolidBackground(
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
2535 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { 2533 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
2536 gfx::Point icon_bottom( 2534 gfx::Point icon_bottom(
2537 toolbar_->location_bar()->GetLocationBarAnchorPoint()); 2535 toolbar_->location_bar()->GetLocationBarAnchorPoint());
2538 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); 2536 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
2539 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); 2537 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
2540 ConvertPointToTarget(infobar_container_, this, &infobar_top); 2538 ConvertPointToTarget(infobar_container_, this, &infobar_top);
2541 top_arrow_height = infobar_top.y() - icon_bottom.y(); 2539 top_arrow_height = infobar_top.y() - icon_bottom.y();
2542 } 2540 }
2543 return top_arrow_height; 2541 return top_arrow_height;
2544 } 2542 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698