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

Side by Side Diff: ui/views/controls/webview/webview.h

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include <stdint.h>
9
10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
10 #include "content/public/browser/render_process_host_observer.h" 12 #include "content/public/browser/render_process_host_observer.h"
11 #include "content/public/browser/web_contents_delegate.h" 13 #include "content/public/browser/web_contents_delegate.h"
12 #include "content/public/browser/web_contents_observer.h" 14 #include "content/public/browser/web_contents_observer.h"
13 #include "ui/views/accessibility/native_view_accessibility.h" 15 #include "ui/views/accessibility/native_view_accessibility.h"
14 #include "ui/views/controls/webview/webview_export.h" 16 #include "ui/views/controls/webview/webview_export.h"
15 #include "ui/views/view.h" 17 #include "ui/views/view.h"
16 18
17 namespace views { 19 namespace views {
18 20
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 void RenderViewHostChanged(content::RenderViewHost* old_host, 131 void RenderViewHostChanged(content::RenderViewHost* old_host,
130 content::RenderViewHost* new_host) override; 132 content::RenderViewHost* new_host) override;
131 void WebContentsDestroyed() override; 133 void WebContentsDestroyed() override;
132 void DidShowFullscreenWidget(int routing_id) override; 134 void DidShowFullscreenWidget(int routing_id) override;
133 void DidDestroyFullscreenWidget(int routing_id) override; 135 void DidDestroyFullscreenWidget(int routing_id) override;
134 void DidToggleFullscreenModeForTab(bool entered_fullscreen) override; 136 void DidToggleFullscreenModeForTab(bool entered_fullscreen) override;
135 void DidAttachInterstitialPage() override; 137 void DidAttachInterstitialPage() override;
136 void DidDetachInterstitialPage() override; 138 void DidDetachInterstitialPage() override;
137 // Workaround for MSVC++ linker bug/feature that requires 139 // Workaround for MSVC++ linker bug/feature that requires
138 // instantiation of the inline IPC::Listener methods in all translation units. 140 // instantiation of the inline IPC::Listener methods in all translation units.
139 void OnChannelConnected(int32 peer_id) override {} 141 void OnChannelConnected(int32_t peer_id) override {}
140 void OnChannelError() override {} 142 void OnChannelError() override {}
141 void OnBadMessageReceived(const IPC::Message& message) override {} 143 void OnBadMessageReceived(const IPC::Message& message) override {}
142 void OnWebContentsFocused() override; 144 void OnWebContentsFocused() override;
143 145
144 private: 146 private:
145 friend class WebViewUnitTest; 147 friend class WebViewUnitTest;
146 148
147 void AttachWebContents(); 149 void AttachWebContents();
148 void DetachWebContents(); 150 void DetachWebContents();
149 void ReattachForFullscreenChange(bool enter_fullscreen); 151 void ReattachForFullscreenChange(bool enter_fullscreen);
(...skipping 21 matching lines...) Expand all
171 content::BrowserContext* browser_context_; 173 content::BrowserContext* browser_context_;
172 bool allow_accelerators_; 174 bool allow_accelerators_;
173 gfx::Size preferred_size_; 175 gfx::Size preferred_size_;
174 176
175 DISALLOW_COPY_AND_ASSIGN(WebView); 177 DISALLOW_COPY_AND_ASSIGN(WebView);
176 }; 178 };
177 179
178 } // namespace views 180 } // namespace views
179 181
180 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 182 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698