third_party/WebKit/Source/web/AssertMatchingEnums.cpp - Issue 1860743002: Add a flag to change when android's progress bar completes

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

Issue 1860743002: Add a flag to change when android's progress bar completes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove unneeded variables on ProgressTracker Created 4 years, 6 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

« chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java ('K') | « third_party/WebKit/Source/core/loader/ProgressTracker.cpp ('k') | third_party/WebKit/Source/web/WebSettingsImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 736 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
747 STATIC_ASSERT_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeReplaceCur rentItem);	747 STATIC_ASSERT_ENUM(WebFrameLoadType::ReplaceCurrentItem, FrameLoadTypeReplaceCur rentItem);

748 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadTypeInitialIn ChildFrame);	748 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialInChildFrame, FrameLoadTypeInitialIn ChildFrame);

749 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeInitialHis toryLoad);	749 STATIC_ASSERT_ENUM(WebFrameLoadType::InitialHistoryLoad, FrameLoadTypeInitialHis toryLoad);

750 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache, FrameLoadTypeReloadBy passingCache);	750 STATIC_ASSERT_ENUM(WebFrameLoadType::ReloadBypassingCache, FrameLoadTypeReloadBy passingCache);

751	751

752 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType::Remove);	752 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebFrameClient::DetachType::Remove);

753 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::Swap);	753 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebFrameClient::DetachType::Swap);

754 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::DetachType::Re move);	754 STATIC_ASSERT_ENUM(FrameDetachType::Remove, WebRemoteFrameClient::DetachType::Re move);

755 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap );	755 STATIC_ASSERT_ENUM(FrameDetachType::Swap, WebRemoteFrameClient::DetachType::Swap );

756	756

	757 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::LoadEvent, ProgressBarCom pletion::LoadEvent);

	758 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCL, Progr essBarCompletion::ResourcesBeforeDCL);

	759 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::DOMContentLoaded, Progres sBarCompletion::DOMContentLoaded);

	760 STATIC_ASSERT_ENUM(WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSame OriginIFrames, ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames);

	761

757 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, "");	762 static_assert(kSerializedScriptValueVersion == SerializedScriptValue::wireFormat Version, "");

758	763

759 } // namespace blink	764 } // namespace blink

OLD	NEW