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

Side by Side Diff: components/web_view/frame.h

Issue 1549993003: Switch to standard integer types in components/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « components/web_view/find_controller.h ('k') | components/web_view/frame.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 COMPONENTS_WEB_VIEW_FRAME_H_ 5 #ifndef COMPONENTS_WEB_VIEW_FRAME_H_
6 #define COMPONENTS_WEB_VIEW_FRAME_H_ 6 #define COMPONENTS_WEB_VIEW_FRAME_H_
7 7
8 #include <stdint.h>
9
8 #include <map> 10 #include <map>
9 #include <vector> 11 #include <vector>
10 12
11 #include "base/basictypes.h" 13 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
13 #include "base/time/time.h" 15 #include "base/time/time.h"
14 #include "components/mus/common/types.h" 16 #include "components/mus/common/types.h"
15 #include "components/mus/public/cpp/window_observer.h" 17 #include "components/mus/public/cpp/window_observer.h"
16 #include "components/web_view/public/interfaces/frame.mojom.h" 18 #include "components/web_view/public/interfaces/frame.mojom.h"
17 #include "mojo/public/cpp/bindings/binding.h" 19 #include "mojo/public/cpp/bindings/binding.h"
18 20
19 class GURL; 21 class GURL;
20 22
21 namespace web_view { 23 namespace web_view {
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 static void OnConnectAck( 171 static void OnConnectAck(
170 scoped_ptr<FrameUserDataAndBinding> data_and_binding); 172 scoped_ptr<FrameUserDataAndBinding> data_and_binding);
171 173
172 // Callback from OnEmbed(). 174 // Callback from OnEmbed().
173 void OnEmbedAck(bool success, mus::ConnectionSpecificId connection_id); 175 void OnEmbedAck(bool success, mus::ConnectionSpecificId connection_id);
174 176
175 // Callback from Frame::OnWillNavigate(). Completes navigation. 177 // Callback from Frame::OnWillNavigate(). Completes navigation.
176 void OnWillNavigateAck(mojom::FrameClient* frame_client, 178 void OnWillNavigateAck(mojom::FrameClient* frame_client,
177 scoped_ptr<FrameUserData> user_data, 179 scoped_ptr<FrameUserData> user_data,
178 mus::mojom::WindowTreeClientPtr window_tree_client, 180 mus::mojom::WindowTreeClientPtr window_tree_client,
179 uint32 app_id, 181 uint32_t app_id,
180 base::TimeTicks navigation_start_time); 182 base::TimeTicks navigation_start_time);
181 183
182 // Completes a navigation request; swapping the existing FrameClient to the 184 // Completes a navigation request; swapping the existing FrameClient to the
183 // supplied arguments. 185 // supplied arguments.
184 void ChangeClient(mojom::FrameClient* frame_client, 186 void ChangeClient(mojom::FrameClient* frame_client,
185 scoped_ptr<FrameUserData> user_data, 187 scoped_ptr<FrameUserData> user_data,
186 mus::mojom::WindowTreeClientPtr window_tree_client, 188 mus::mojom::WindowTreeClientPtr window_tree_client,
187 uint32 app_id, 189 uint32_t app_id,
188 base::TimeTicks navigation_start_time); 190 base::TimeTicks navigation_start_time);
189 191
190 void SetWindow(mus::Window* window); 192 void SetWindow(mus::Window* window);
191 193
192 // Adds this to |frames| and recurses through the children calling the 194 // Adds this to |frames| and recurses through the children calling the
193 // same function. 195 // same function.
194 void BuildFrameTree(std::vector<const Frame*>* frames) const; 196 void BuildFrameTree(std::vector<const Frame*>* frames) const;
195 197
196 void Add(Frame* node); 198 void Add(Frame* node);
197 void Remove(Frame* node); 199 void Remove(Frame* node);
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 base::WeakPtrFactory<Frame> embed_weak_ptr_factory_; 285 base::WeakPtrFactory<Frame> embed_weak_ptr_factory_;
284 286
285 base::WeakPtrFactory<Frame> navigate_weak_ptr_factory_; 287 base::WeakPtrFactory<Frame> navigate_weak_ptr_factory_;
286 288
287 DISALLOW_COPY_AND_ASSIGN(Frame); 289 DISALLOW_COPY_AND_ASSIGN(Frame);
288 }; 290 };
289 291
290 } // namespace web_view 292 } // namespace web_view
291 293
292 #endif // COMPONENTS_WEB_VIEW_FRAME_H_ 294 #endif // COMPONENTS_WEB_VIEW_FRAME_H_
OLDNEW
« no previous file with comments | « components/web_view/find_controller.h ('k') | components/web_view/frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698