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

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

Issue 12089102: Make most code on mac compile with enable_web_intents=0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ffff Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/test_location_bar.h ('k') | content/browser/web_contents/web_contents_impl.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 (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 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 void OnDialogClosed(RenderViewHost* rvh, 504 void OnDialogClosed(RenderViewHost* rvh,
505 IPC::Message* reply_msg, 505 IPC::Message* reply_msg,
506 bool success, 506 bool success,
507 const string16& user_input); 507 const string16& user_input);
508 508
509 // Callback function when requesting permission to access the PPAPI broker. 509 // Callback function when requesting permission to access the PPAPI broker.
510 // |result| is true if permission was granted. 510 // |result| is true if permission was granted.
511 void OnPpapiBrokerPermissionResult(int request_id, bool result); 511 void OnPpapiBrokerPermissionResult(int request_id, bool result);
512 512
513 // IPC message handlers. 513 // IPC message handlers.
514 #if defined(ENABLE_WEB_INTENTS)
514 void OnRegisterIntentService(const webkit_glue::WebIntentServiceData& data, 515 void OnRegisterIntentService(const webkit_glue::WebIntentServiceData& data,
515 bool user_gesture); 516 bool user_gesture);
516 void OnWebIntentDispatch(const webkit_glue::WebIntentData& intent, 517 void OnWebIntentDispatch(const webkit_glue::WebIntentData& intent,
517 int intent_id); 518 int intent_id);
519 #endif
518 void OnDidLoadResourceFromMemoryCache(const GURL& url, 520 void OnDidLoadResourceFromMemoryCache(const GURL& url,
519 const std::string& security_info, 521 const std::string& security_info,
520 const std::string& http_request, 522 const std::string& http_request,
521 const std::string& mime_type, 523 const std::string& mime_type,
522 ResourceType::Type resource_type); 524 ResourceType::Type resource_type);
523 void OnDidDisplayInsecureContent(); 525 void OnDidDisplayInsecureContent();
524 void OnDidRunInsecureContent(const std::string& security_origin, 526 void OnDidRunInsecureContent(const std::string& security_origin,
525 const GURL& target_url); 527 const GURL& target_url);
526 void OnDocumentLoadedInFrame(int64 frame_id); 528 void OnDocumentLoadedInFrame(int64 frame_id);
527 void OnDidFinishLoad(int64 frame_id, 529 void OnDidFinishLoad(int64 frame_id,
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 // Maps the ids of pending favicon downloads to their callbacks 876 // Maps the ids of pending favicon downloads to their callbacks
875 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap; 877 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap;
876 FaviconDownloadMap favicon_download_map_; 878 FaviconDownloadMap favicon_download_map_;
877 879
878 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 880 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
879 }; 881 };
880 882
881 } // namespace content 883 } // namespace content
882 884
883 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 885 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/test/base/test_location_bar.h ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698