| Index: components/web_view/frame.h
|
| diff --git a/components/web_view/frame.h b/components/web_view/frame.h
|
| index 3fa2ff373e373be1b81ec9d0a2400144a6c17089..ec7c6ca9291a6754688ffa0448bb9889939dfdac 100644
|
| --- a/components/web_view/frame.h
|
| +++ b/components/web_view/frame.h
|
| @@ -5,10 +5,12 @@
|
| #ifndef COMPONENTS_WEB_VIEW_FRAME_H_
|
| #define COMPONENTS_WEB_VIEW_FRAME_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "components/mus/common/types.h"
|
| @@ -176,7 +178,7 @@ class Frame : public mus::WindowObserver, public mojom::Frame {
|
| void OnWillNavigateAck(mojom::FrameClient* frame_client,
|
| scoped_ptr<FrameUserData> user_data,
|
| mus::mojom::WindowTreeClientPtr window_tree_client,
|
| - uint32 app_id,
|
| + uint32_t app_id,
|
| base::TimeTicks navigation_start_time);
|
|
|
| // Completes a navigation request; swapping the existing FrameClient to the
|
| @@ -184,7 +186,7 @@ class Frame : public mus::WindowObserver, public mojom::Frame {
|
| void ChangeClient(mojom::FrameClient* frame_client,
|
| scoped_ptr<FrameUserData> user_data,
|
| mus::mojom::WindowTreeClientPtr window_tree_client,
|
| - uint32 app_id,
|
| + uint32_t app_id,
|
| base::TimeTicks navigation_start_time);
|
|
|
| void SetWindow(mus::Window* window);
|
|
|