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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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 // 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 13 matching lines...) Expand all
24 #include "content/browser/frame_host/render_frame_host_manager.h" 24 #include "content/browser/frame_host/render_frame_host_manager.h"
25 #include "content/browser/media/audio_stream_monitor.h" 25 #include "content/browser/media/audio_stream_monitor.h"
26 #include "content/browser/renderer_host/render_view_host_delegate.h" 26 #include "content/browser/renderer_host/render_view_host_delegate.h"
27 #include "content/browser/renderer_host/render_widget_host_delegate.h" 27 #include "content/browser/renderer_host/render_widget_host_delegate.h"
28 #include "content/common/accessibility_mode_enums.h" 28 #include "content/common/accessibility_mode_enums.h"
29 #include "content/common/content_export.h" 29 #include "content/common/content_export.h"
30 #include "content/public/browser/color_chooser.h" 30 #include "content/public/browser/color_chooser.h"
31 #include "content/public/browser/notification_observer.h" 31 #include "content/public/browser/notification_observer.h"
32 #include "content/public/browser/notification_registrar.h" 32 #include "content/public/browser/notification_registrar.h"
33 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
34 #include "content/public/common/page_transition_types.h"
35 #include "content/public/common/renderer_preferences.h" 34 #include "content/public/common/renderer_preferences.h"
36 #include "content/public/common/resource_type.h" 35 #include "content/public/common/resource_type.h"
37 #include "content/public/common/three_d_api_types.h" 36 #include "content/public/common/three_d_api_types.h"
38 #include "net/base/load_states.h" 37 #include "net/base/load_states.h"
39 #include "net/http/http_response_headers.h" 38 #include "net/http/http_response_headers.h"
40 #include "third_party/WebKit/public/web/WebDragOperation.h" 39 #include "third_party/WebKit/public/web/WebDragOperation.h"
40 #include "ui/base/page_transition_types.h"
41 #include "ui/gfx/rect_f.h" 41 #include "ui/gfx/rect_f.h"
42 #include "ui/gfx/size.h" 42 #include "ui/gfx/size.h"
43 43
44 struct BrowserPluginHostMsg_ResizeGuest_Params; 44 struct BrowserPluginHostMsg_ResizeGuest_Params;
45 struct ViewHostMsg_DateTimeDialogValue_Params; 45 struct ViewHostMsg_DateTimeDialogValue_Params;
46 struct ViewMsg_PostMessage_Params; 46 struct ViewMsg_PostMessage_Params;
47 47
48 namespace content { 48 namespace content {
49 class BrowserPluginEmbedder; 49 class BrowserPluginEmbedder;
50 class BrowserPluginGuest; 50 class BrowserPluginGuest;
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 RenderFrameHostImpl* render_frame_host, 501 RenderFrameHostImpl* render_frame_host,
502 const GURL& url, 502 const GURL& url,
503 int error_code, 503 int error_code,
504 const base::string16& error_description) OVERRIDE; 504 const base::string16& error_description) OVERRIDE;
505 virtual void DidRedirectProvisionalLoad( 505 virtual void DidRedirectProvisionalLoad(
506 RenderFrameHostImpl* render_frame_host, 506 RenderFrameHostImpl* render_frame_host,
507 const GURL& validated_target_url) OVERRIDE; 507 const GURL& validated_target_url) OVERRIDE;
508 virtual void DidCommitProvisionalLoad( 508 virtual void DidCommitProvisionalLoad(
509 RenderFrameHostImpl* render_frame_host, 509 RenderFrameHostImpl* render_frame_host,
510 const GURL& url, 510 const GURL& url,
511 PageTransition transition_type) OVERRIDE; 511 ui::PageTransition transition_type) OVERRIDE;
512 virtual void DidNavigateMainFramePreCommit( 512 virtual void DidNavigateMainFramePreCommit(
513 bool navigation_is_within_page) OVERRIDE; 513 bool navigation_is_within_page) OVERRIDE;
514 virtual void DidNavigateMainFramePostCommit( 514 virtual void DidNavigateMainFramePostCommit(
515 const LoadCommittedDetails& details, 515 const LoadCommittedDetails& details,
516 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE; 516 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;
517 virtual void DidNavigateAnyFramePostCommit( 517 virtual void DidNavigateAnyFramePostCommit(
518 RenderFrameHostImpl* render_frame_host, 518 RenderFrameHostImpl* render_frame_host,
519 const LoadCommittedDetails& details, 519 const LoadCommittedDetails& details,
520 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE; 520 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;
521 virtual void SetMainFrameMimeType(const std::string& mime_type) OVERRIDE; 521 virtual void SetMainFrameMimeType(const std::string& mime_type) OVERRIDE;
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
1242 AudioStreamMonitor audio_stream_monitor_; 1242 AudioStreamMonitor audio_stream_monitor_;
1243 1243
1244 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; 1244 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
1245 1245
1246 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1246 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1247 }; 1247 };
1248 1248
1249 } // namespace content 1249 } // namespace content
1250 1250
1251 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1251 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/site_per_process_browsertest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698