X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fui%2Ffullscreen%2Ffullscreen_controller.cc;h=ce9c587c08d02aa6e5464d5dfb06c4bddcde4a69;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=e6a34b4d05f1372eaf49467957c4e02908863467;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/ui/fullscreen/fullscreen_controller.cc b/src/chrome/browser/ui/fullscreen/fullscreen_controller.cc index e6a34b4..ce9c587 100644 --- a/src/chrome/browser/ui/fullscreen/fullscreen_controller.cc +++ b/src/chrome/browser/ui/fullscreen/fullscreen_controller.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" -#include "apps/ui/web_contents_sizer.h" #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" @@ -19,6 +18,7 @@ #include "chrome/browser/ui/fullscreen/fullscreen_within_tab_helper.h" #include "chrome/browser/ui/status_bubble.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/browser/ui/web_contents_sizer.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" @@ -208,9 +208,6 @@ void FullscreenController::SetMetroSnapMode(bool enable) { #if defined(OS_MACOSX) void FullscreenController::ToggleBrowserFullscreenWithChrome() { - // This method cannot be called if simplified fullscreen is enabled. - const CommandLine* command_line = CommandLine::ForCurrentProcess(); - DCHECK(!command_line->HasSwitch(switches::kEnableSimplifiedFullscreen)); ToggleFullscreenModeInternal(BROWSER_WITH_CHROME); } #endif @@ -311,7 +308,7 @@ void FullscreenController::OnTabDetachedFromView(WebContents* old_contents) { old_contents->GetFullscreenRenderWidgetHostView(); if (current_fs_view) current_fs_view->SetSize(old_contents->GetPreferredSize()); - apps::ResizeWebContents(old_contents, old_contents->GetPreferredSize()); + ResizeWebContents(old_contents, old_contents->GetPreferredSize()); } void FullscreenController::OnTabClosing(WebContents* web_contents) {