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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 99093004: Merge 237646 "Ensure that the OSK on Windows 8 shows up when we ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1700/src/
Patch Set: Created 7 years 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 | Annotate | Revision Log
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_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 void OnDidZoomURL(double zoom_level, bool remember, const GURL& url); 578 void OnDidZoomURL(double zoom_level, bool remember, const GURL& url);
579 void OnRequestDesktopNotificationPermission(const GURL& origin, 579 void OnRequestDesktopNotificationPermission(const GURL& origin,
580 int callback_id); 580 int callback_id);
581 void OnShowDesktopNotification( 581 void OnShowDesktopNotification(
582 const ShowDesktopNotificationHostMsgParams& params); 582 const ShowDesktopNotificationHostMsgParams& params);
583 void OnCancelDesktopNotification(int notification_id); 583 void OnCancelDesktopNotification(int notification_id);
584 void OnRunFileChooser(const FileChooserParams& params); 584 void OnRunFileChooser(const FileChooserParams& params);
585 void OnDidAccessInitialDocument(); 585 void OnDidAccessInitialDocument();
586 void OnDomOperationResponse(const std::string& json_string, 586 void OnDomOperationResponse(const std::string& json_string,
587 int automation_id); 587 int automation_id);
588 void OnFocusedNodeTouched(bool editable);
588 589
589 #if defined(OS_MACOSX) || defined(OS_ANDROID) 590 #if defined(OS_MACOSX) || defined(OS_ANDROID)
590 void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params); 591 void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params);
591 #endif 592 #endif
592 593
593 // TODO(nasko): Remove this accessor once RenderFrameHost moves into the frame 594 // TODO(nasko): Remove this accessor once RenderFrameHost moves into the frame
594 // tree. 595 // tree.
595 RenderFrameHostImpl* main_render_frame_host() const { 596 RenderFrameHostImpl* main_render_frame_host() const {
596 return main_render_frame_host_.get(); 597 return main_render_frame_host_.get();
597 } 598 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 721 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
721 }; 722 };
722 723
723 #if defined(COMPILER_MSVC) 724 #if defined(COMPILER_MSVC)
724 #pragma warning(pop) 725 #pragma warning(pop)
725 #endif 726 #endif
726 727
727 } // namespace content 728 } // namespace content
728 729
729 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 730 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698