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

Side by Side Diff: content/browser/frame_host/navigation_entry_impl.h

Issue 2742333002: Remove ScopedVector from content/browser/ [1]. (Closed)
Patch Set: Created 3 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory>
12 #include <vector>
11 13
12 #include "base/macros.h" 14 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_vector.h"
15 #include "base/time/time.h" 16 #include "base/time/time.h"
16 #include "build/build_config.h" 17 #include "build/build_config.h"
17 #include "content/browser/frame_host/frame_navigation_entry.h" 18 #include "content/browser/frame_host/frame_navigation_entry.h"
18 #include "content/browser/frame_host/frame_tree_node.h" 19 #include "content/browser/frame_host/frame_tree_node.h"
19 #include "content/browser/site_instance_impl.h" 20 #include "content/browser/site_instance_impl.h"
20 #include "content/common/frame_message_enums.h" 21 #include "content/common/frame_message_enums.h"
21 #include "content/common/resource_request_body_impl.h" 22 #include "content/common/resource_request_body_impl.h"
22 #include "content/public/browser/favicon_status.h" 23 #include "content/public/browser/favicon_status.h"
23 #include "content/public/browser/global_request_id.h" 24 #include "content/public/browser/global_request_id.h"
24 #include "content/public/browser/navigation_entry.h" 25 #include "content/public/browser/navigation_entry.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 TreeNode* parent_node) const; 66 TreeNode* parent_node) const;
66 67
67 // The parent of this node. 68 // The parent of this node.
68 TreeNode* parent; 69 TreeNode* parent;
69 70
70 // Ref counted pointer that keeps the FrameNavigationEntry alive as long as 71 // Ref counted pointer that keeps the FrameNavigationEntry alive as long as
71 // it is needed by this node's NavigationEntry. 72 // it is needed by this node's NavigationEntry.
72 scoped_refptr<FrameNavigationEntry> frame_entry; 73 scoped_refptr<FrameNavigationEntry> frame_entry;
73 74
74 // List of child TreeNodes, which will be deleted when this node is. 75 // List of child TreeNodes, which will be deleted when this node is.
75 ScopedVector<TreeNode> children; 76 std::vector<std::unique_ptr<TreeNode>> children;
76 }; 77 };
77 78
78 static NavigationEntryImpl* FromNavigationEntry(NavigationEntry* entry); 79 static NavigationEntryImpl* FromNavigationEntry(NavigationEntry* entry);
79 static const NavigationEntryImpl* FromNavigationEntry( 80 static const NavigationEntryImpl* FromNavigationEntry(
80 const NavigationEntry* entry); 81 const NavigationEntry* entry);
81 static std::unique_ptr<NavigationEntryImpl> FromNavigationEntry( 82 static std::unique_ptr<NavigationEntryImpl> FromNavigationEntry(
82 std::unique_ptr<NavigationEntry> entry); 83 std::unique_ptr<NavigationEntry> entry);
83 84
84 // The value of bindings() before it is set during commit. 85 // The value of bindings() before it is set during commit.
85 static int kInvalidBindings; 86 static int kInvalidBindings;
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 // Set to true if the navigation controller gets notified about a SSL error 554 // Set to true if the navigation controller gets notified about a SSL error
554 // for a pending navigation. Defaults to false. 555 // for a pending navigation. Defaults to false.
555 bool ssl_error_; 556 bool ssl_error_;
556 557
557 DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl); 558 DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl);
558 }; 559 };
559 560
560 } // namespace content 561 } // namespace content
561 562
562 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ 563 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698