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

Side by Side Diff: chrome/browser/ui/fullscreen/fullscreen_controller_state_test.cc

Issue 789533002: Fullscreen: make fullscreen requests come from RenderFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update webcontentsdelegateandroid Created 6 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/fullscreen/fullscreen_controller_state_test.h" 5 #include "chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h"
6 6
7 #include <memory.h> 7 #include <memory.h>
8 8
9 #include <iomanip> 9 #include <iomanip>
10 #include <iostream> 10 #include <iostream>
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 break; 381 break;
382 } 382 }
383 #endif 383 #endif
384 NOTREACHED() << GetAndClearDebugLog(); 384 NOTREACHED() << GetAndClearDebugLog();
385 break; 385 break;
386 386
387 case TAB_FULLSCREEN_TRUE: 387 case TAB_FULLSCREEN_TRUE:
388 case TAB_FULLSCREEN_FALSE: { 388 case TAB_FULLSCREEN_FALSE: {
389 content::WebContents* const active_tab = 389 content::WebContents* const active_tab =
390 GetBrowser()->tab_strip_model()->GetActiveWebContents(); 390 GetBrowser()->tab_strip_model()->GetActiveWebContents();
391 GetFullscreenController()-> 391 GetFullscreenController()->ToggleFullscreenModeForTab(
392 ToggleFullscreenModeForTab(active_tab, event == TAB_FULLSCREEN_TRUE); 392 active_tab, GURL(), event == TAB_FULLSCREEN_TRUE);
393 // Activating/Deactivating tab fullscreen on a captured tab should not 393 // Activating/Deactivating tab fullscreen on a captured tab should not
394 // evoke a state change in the browser window. 394 // evoke a state change in the browser window.
395 if (active_tab->GetCapturerCount() > 0) 395 if (active_tab->GetCapturerCount() > 0)
396 state_ = source_state; 396 state_ = source_state;
397 break; 397 break;
398 } 398 }
399 399
400 case METRO_SNAP_TRUE: 400 case METRO_SNAP_TRUE:
401 #if defined(OS_WIN) 401 #if defined(OS_WIN)
402 GetFullscreenController()->SetMetroSnapMode(true); 402 GetFullscreenController()->SetMetroSnapMode(true);
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 << std::right << std::setw(2) 798 << std::right << std::setw(2)
799 << info.distance 799 << info.distance
800 << " }, // " 800 << " }, // "
801 << GetStateString(state2) << "\n"; 801 << GetStateString(state2) << "\n";
802 } 802 }
803 output << "},\n"; 803 output << "},\n";
804 } 804 }
805 output << "};"; 805 output << "};";
806 return output.str(); 806 return output.str();
807 } 807 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698