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

Side by Side Diff: chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_tabstrip.h" 8 #include "chrome/browser/ui/browser_tabstrip.h"
9 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" 9 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
10 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 10 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 void EnterFullscreen(const GURL& url, 44 void EnterFullscreen(const GURL& url,
45 ExclusiveAccessBubbleType type, 45 ExclusiveAccessBubbleType type,
46 bool with_toolbar) override; 46 bool with_toolbar) override;
47 void ExitFullscreen() override; 47 void ExitFullscreen() override;
48 bool ShouldHideUIForFullscreen() const override; 48 bool ShouldHideUIForFullscreen() const override;
49 bool IsFullscreen() const override; 49 bool IsFullscreen() const override;
50 bool SupportsFullscreenWithToolbar() const override; 50 bool SupportsFullscreenWithToolbar() const override;
51 void UpdateFullscreenWithToolbar(bool with_toolbar) override; 51 void UpdateFullscreenWithToolbar(bool with_toolbar) override;
52 bool IsFullscreenWithToolbar() const override; 52 bool IsFullscreenWithToolbar() const override;
53 #if defined(OS_WIN) 53 #if defined(OS_WIN)
54 virtual void SetMetroSnapMode(bool enable) override; 54 void SetMetroSnapMode(bool enable) override;
55 virtual bool IsInMetroSnapMode() const override; 55 bool IsInMetroSnapMode() const override;
56 #endif 56 #endif
57 static const char* GetWindowStateString(WindowState state); 57 static const char* GetWindowStateString(WindowState state);
58 WindowState state() const { return state_; } 58 WindowState state() const { return state_; }
59 void set_browser(Browser* browser) { browser_ = browser; } 59 void set_browser(Browser* browser) { browser_ = browser; }
60 ExclusiveAccessContext* GetExclusiveAccessContext() override; 60 ExclusiveAccessContext* GetExclusiveAccessContext() override;
61 61
62 // ExclusiveAccessContext Interface: 62 // ExclusiveAccessContext Interface:
63 Profile* GetProfile() override; 63 Profile* GetProfile() override;
64 content::WebContents* GetActiveWebContents() override; 64 content::WebContents* GetActiveWebContents() override;
65 void HideDownloadShelf() override; 65 void HideDownloadShelf() override;
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 EXPECT_FALSE(wc_delegate->IsFullscreenForTabOrPending(tab)); 827 EXPECT_FALSE(wc_delegate->IsFullscreenForTabOrPending(tab));
828 EXPECT_FALSE(second_wc_delegate->IsFullscreenForTabOrPending(tab)); 828 EXPECT_FALSE(second_wc_delegate->IsFullscreenForTabOrPending(tab));
829 EXPECT_FALSE(GetFullscreenController()->IsWindowFullscreenForTabOrPending()); 829 EXPECT_FALSE(GetFullscreenController()->IsWindowFullscreenForTabOrPending());
830 EXPECT_FALSE(second_browser->exclusive_access_manager() 830 EXPECT_FALSE(second_browser->exclusive_access_manager()
831 ->fullscreen_controller() 831 ->fullscreen_controller()
832 ->IsWindowFullscreenForTabOrPending()); 832 ->IsWindowFullscreenForTabOrPending());
833 833
834 // Required tear-down specific to this test. 834 // Required tear-down specific to this test.
835 second_browser->tab_strip_model()->CloseAllTabs(); 835 second_browser->tab_strip_model()->CloseAllTabs();
836 } 836 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698