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

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

Issue 23477051: Embed Flash Fullscreen widget within browser window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add caution comment to chrome_switches.cc. Created 7 years, 3 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 1924 matching lines...) Expand 10 before | Expand all | Expand 10 after
1935 InitHangMonitor(); 1935 InitHangMonitor();
1936 } 1936 }
1937 1937
1938 LoadAccelerators(); 1938 LoadAccelerators();
1939 1939
1940 infobar_container_ = new InfoBarContainerView(this); 1940 infobar_container_ = new InfoBarContainerView(this);
1941 AddChildView(infobar_container_); 1941 AddChildView(infobar_container_);
1942 1942
1943 contents_web_view_ = new views::WebView(browser_->profile()); 1943 contents_web_view_ = new views::WebView(browser_->profile());
1944 contents_web_view_->set_id(VIEW_ID_TAB_CONTAINER); 1944 contents_web_view_->set_id(VIEW_ID_TAB_CONTAINER);
1945 contents_web_view_->SetEmbedFullscreenWidgetMode(
1946 implicit_cast<content::WebContentsDelegate*>(browser_.get())->
1947 EmbedsFullscreenWidget());
1945 contents_container_ = new ContentsContainer(contents_web_view_); 1948 contents_container_ = new ContentsContainer(contents_web_view_);
1946 1949
1947 SkColor bg_color = GetWidget()->GetThemeProvider()-> 1950 SkColor bg_color = GetWidget()->GetThemeProvider()->
1948 GetColor(ThemeProperties::COLOR_TOOLBAR); 1951 GetColor(ThemeProperties::COLOR_TOOLBAR);
1949 1952
1950 devtools_container_ = new views::WebView(browser_->profile()); 1953 devtools_container_ = new views::WebView(browser_->profile());
1951 devtools_container_->set_id(VIEW_ID_DEV_TOOLS_DOCKED); 1954 devtools_container_->set_id(VIEW_ID_DEV_TOOLS_DOCKED);
1952 devtools_container_->SetVisible(false); 1955 devtools_container_->SetVisible(false);
1953 1956
1954 views::View* contents_container_view = contents_container_; 1957 views::View* contents_container_view = contents_container_;
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
2674 // The +1 in the next line creates a 1-px gap between icon and arrow tip. 2677 // The +1 in the next line creates a 1-px gap between icon and arrow tip.
2675 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() - 2678 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() -
2676 LocationBarView::kIconInternalPadding + 1); 2679 LocationBarView::kIconInternalPadding + 1);
2677 ConvertPointToTarget(location_icon_view, this, &icon_bottom); 2680 ConvertPointToTarget(location_icon_view, this, &icon_bottom);
2678 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); 2681 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
2679 ConvertPointToTarget(infobar_container_, this, &infobar_top); 2682 ConvertPointToTarget(infobar_container_, this, &infobar_top);
2680 top_arrow_height = infobar_top.y() - icon_bottom.y(); 2683 top_arrow_height = infobar_top.y() - icon_bottom.y();
2681 } 2684 }
2682 return top_arrow_height; 2685 return top_arrow_height;
2683 } 2686 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/fullscreen/fullscreen_controller_test.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698