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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.h

Issue 2346663004: Moving platform tracing things into platform/tracing. (Closed)
Patch Set: Created 4 years, 3 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) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 25 matching lines...) Expand all
36 #include "core/dom/IconURL.h" 36 #include "core/dom/IconURL.h"
37 #include "core/dom/SandboxFlags.h" 37 #include "core/dom/SandboxFlags.h"
38 #include "core/dom/SecurityContext.h" 38 #include "core/dom/SecurityContext.h"
39 #include "core/fetch/ResourceLoaderOptions.h" 39 #include "core/fetch/ResourceLoaderOptions.h"
40 #include "core/frame/FrameTypes.h" 40 #include "core/frame/FrameTypes.h"
41 #include "core/loader/FrameLoaderStateMachine.h" 41 #include "core/loader/FrameLoaderStateMachine.h"
42 #include "core/loader/FrameLoaderTypes.h" 42 #include "core/loader/FrameLoaderTypes.h"
43 #include "core/loader/HistoryItem.h" 43 #include "core/loader/HistoryItem.h"
44 #include "core/loader/NavigationPolicy.h" 44 #include "core/loader/NavigationPolicy.h"
45 #include "platform/Timer.h" 45 #include "platform/Timer.h"
46 #include "platform/TracedValue.h"
47 #include "platform/heap/Handle.h" 46 #include "platform/heap/Handle.h"
48 #include "platform/network/ResourceRequest.h" 47 #include "platform/network/ResourceRequest.h"
48 #include "platform/tracing/TracedValue.h"
49 #include "public/platform/WebInsecureRequestPolicy.h" 49 #include "public/platform/WebInsecureRequestPolicy.h"
50 #include "wtf/Forward.h" 50 #include "wtf/Forward.h"
51 #include "wtf/HashSet.h" 51 #include "wtf/HashSet.h"
52 #include <memory> 52 #include <memory>
53 53
54 namespace blink { 54 namespace blink {
55 55
56 class DocumentLoader; 56 class DocumentLoader;
57 class Frame; 57 class Frame;
58 class FrameLoaderClient; 58 class FrameLoaderClient;
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 SandboxFlags m_forcedSandboxFlags; 283 SandboxFlags m_forcedSandboxFlags;
284 284
285 bool m_dispatchingDidClearWindowObjectInMainWorld; 285 bool m_dispatchingDidClearWindowObjectInMainWorld;
286 bool m_protectProvisionalLoader; 286 bool m_protectProvisionalLoader;
287 bool m_isNavigationHandledByClient; 287 bool m_isNavigationHandledByClient;
288 }; 288 };
289 289
290 } // namespace blink 290 } // namespace blink
291 291
292 #endif // FrameLoader_h 292 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698