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

Side by Side Diff: third_party/WebKit/Source/web/AssertMatchingEnums.cpp

Issue 1975753006: Pull to refresh: Use new reload type RELOAD_MAIN_RESOURCE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android build fix Created 4 years, 7 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 STATIC_ASSERT_ENUM(WebSandboxFlags::OrientationLock, SandboxOrientationLock); 731 STATIC_ASSERT_ENUM(WebSandboxFlags::OrientationLock, SandboxOrientationLock);
732 STATIC_ASSERT_ENUM(WebSandboxFlags::PropagatesToAuxiliaryBrowsingContexts, Sandb oxPropagatesToAuxiliaryBrowsingContexts); 732 STATIC_ASSERT_ENUM(WebSandboxFlags::PropagatesToAuxiliaryBrowsingContexts, Sandb oxPropagatesToAuxiliaryBrowsingContexts);
733 STATIC_ASSERT_ENUM(WebSandboxFlags::Modals, SandboxModals); 733 STATIC_ASSERT_ENUM(WebSandboxFlags::Modals, SandboxModals);
734 734
735 STATIC_ASSERT_ENUM(FrameLoaderClient::BeforeUnloadHandler, WebFrameClient::Befor eUnloadHandler); 735 STATIC_ASSERT_ENUM(FrameLoaderClient::BeforeUnloadHandler, WebFrameClient::Befor eUnloadHandler);
736 STATIC_ASSERT_ENUM(FrameLoaderClient::UnloadHandler, WebFrameClient::UnloadHandl er); 736 STATIC_ASSERT_ENUM(FrameLoaderClient::UnloadHandler, WebFrameClient::UnloadHandl er);
737 737
738 STATIC_ASSERT_ENUM(WebFrameLoadType::Standard, FrameLoadTypeStandard); 738 STATIC_ASSERT_ENUM(WebFrameLoadType::Standard, FrameLoadTypeStandard);
739 STATIC_ASSERT_ENUM(WebFrameLoadType::BackForward, FrameLoadTypeBackForward); 739 STATIC_ASSERT_ENUM(WebFrameLoadType::BackForward, FrameLoadTypeBackForward);
740 STATIC_ASSERT_ENUM(WebFrameLoadType::Reload, FrameLoadTypeReload); 740 STATIC_ASSERT_ENUM(WebFrameLoadType::Reload, FrameLoadTypeReload);
741 STATIC_ASSERT_ENUM(WebFrameLoadType::Same, FrameLoadTypeSame); 741 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadMainResource, FrameLoadTypeReloadMain Resource);
742 STATIC_ASSERT_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeReplaceCur rentItem); 742 STATIC_ASSERT_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeReplaceCur rentItem);
743 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadTypeInitialIn ChildFrame); 743 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadTypeInitialIn ChildFrame);
744 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeInitialHis toryLoad); 744 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeInitialHis toryLoad);
745 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache, FrameLoadTypeReloadBy passingCache); 745 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache, FrameLoadTypeReloadBy passingCache);
746 746
747 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType::Remove); 747 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType::Remove);
748 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::Swap); 748 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::Swap);
749 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::DetachType::Re move); 749 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::DetachType::Re move);
750 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap ); 750 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap );
751 751
752 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, ""); 752 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, "");
753 753
754 } // namespace blink 754 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698