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

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

Issue 26803002: Follow-ups/Tweaks for Embedded Flash Fullscreen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 2300 matching lines...) Expand 10 before | Expand all | Expand 10 after
2311 frame_->SetFullscreen(fullscreen); 2311 frame_->SetFullscreen(fullscreen);
2312 } 2312 }
2313 2313
2314 // Enable immersive before the browser refreshes its list of enabled commands. 2314 // Enable immersive before the browser refreshes its list of enabled commands.
2315 if (ShouldUseImmersiveFullscreenForUrl(url)) 2315 if (ShouldUseImmersiveFullscreenForUrl(url))
2316 immersive_mode_controller_->SetEnabled(fullscreen); 2316 immersive_mode_controller_->SetEnabled(fullscreen);
2317 2317
2318 browser_->WindowFullscreenStateChanged(); 2318 browser_->WindowFullscreenStateChanged();
2319 2319
2320 if (fullscreen) { 2320 if (fullscreen) {
2321 if (!chrome::IsRunningInAppMode() && 2321 if (!chrome::IsRunningInAppMode() && type != FOR_METRO)
2322 type != FOR_METRO && 2322 UpdateFullscreenExitBubbleContent(url, bubble_type);
2323 !ShouldUseImmersiveFullscreenForUrl(url)) {
sky 2013/10/11 01:56:28 Why are you removing the !ShouldUseImm...?
miu 2013/10/11 03:30:30 It's checked in the call to UpdateFullscreenExitBu
2324 fullscreen_bubble_.reset(new FullscreenExitBubbleViews(
2325 this, url, bubble_type));
2326 }
2327 } else { 2323 } else {
2328 #if defined(OS_WIN) && !defined(USE_AURA) 2324 #if defined(OS_WIN) && !defined(USE_AURA)
2329 if (omnibox_win) { 2325 if (omnibox_win) {
2330 // Show the edit again since we're no longer in fullscreen mode. 2326 // Show the edit again since we're no longer in fullscreen mode.
2331 omnibox_win->set_force_hidden(false); 2327 omnibox_win->set_force_hidden(false);
2332 ShowWindow(omnibox_win->m_hWnd, SW_SHOW); 2328 ShowWindow(omnibox_win->m_hWnd, SW_SHOW);
2333 } 2329 }
2334 #endif 2330 #endif
2335 } 2331 }
2336 2332
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
2678 // The +1 in the next line creates a 1-px gap between icon and arrow tip. 2674 // The +1 in the next line creates a 1-px gap between icon and arrow tip.
2679 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() - 2675 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() -
2680 LocationBarView::kIconInternalPadding + 1); 2676 LocationBarView::kIconInternalPadding + 1);
2681 ConvertPointToTarget(location_icon_view, this, &icon_bottom); 2677 ConvertPointToTarget(location_icon_view, this, &icon_bottom);
2682 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); 2678 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
2683 ConvertPointToTarget(infobar_container_, this, &infobar_top); 2679 ConvertPointToTarget(infobar_container_, this, &infobar_top);
2684 top_arrow_height = infobar_top.y() - icon_bottom.y(); 2680 top_arrow_height = infobar_top.y() - icon_bottom.y();
2685 } 2681 }
2686 return top_arrow_height; 2682 return top_arrow_height;
2687 } 2683 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/fullscreen/fullscreen_controller.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698