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

Side by Side Diff: webkit/glue/webkitclient_impl.cc

Issue 6930029: Make ViewHostMsg_Keygen a routed ipc (part 2/2). Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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 | « webkit/glue/webkitclient_impl.h ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "webkit/glue/webkitclient_impl.h" 5 #include "webkit/glue/webkitclient_impl.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <malloc.h> 8 #include <malloc.h>
9 #endif 9 #endif
10 10
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 long WebKitClientImpl::databaseGetFileAttributes( 510 long WebKitClientImpl::databaseGetFileAttributes(
511 const WebKit::WebString& vfs_file_name) { 511 const WebKit::WebString& vfs_file_name) {
512 return 0; 512 return 0;
513 } 513 }
514 514
515 long long WebKitClientImpl::databaseGetFileSize( 515 long long WebKitClientImpl::databaseGetFileSize(
516 const WebKit::WebString& vfs_file_name) { 516 const WebKit::WebString& vfs_file_name) {
517 return 0; 517 return 0;
518 } 518 }
519 519
520 WebKit::WebString WebKitClientImpl::signedPublicKeyAndChallengeString(
521 unsigned key_size_index,
522 const WebKit::WebString& challenge,
523 const WebKit::WebURL& url) {
524 NOTREACHED();
525 return WebKit::WebString();
526 }
527
528 #if defined(OS_LINUX) 520 #if defined(OS_LINUX)
529 static size_t memoryUsageMBLinux() { 521 static size_t memoryUsageMBLinux() {
530 struct mallinfo minfo = mallinfo(); 522 struct mallinfo minfo = mallinfo();
531 uint64_t mem_usage = 523 uint64_t mem_usage =
532 #if defined(USE_TCMALLOC) 524 #if defined(USE_TCMALLOC)
533 minfo.uordblks 525 minfo.uordblks
534 #else 526 #else
535 (minfo.hblkhd + minfo.arena) 527 (minfo.hblkhd + minfo.arena)
536 #endif 528 #endif
537 >> 20; 529 >> 20;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 ++shared_timer_suspended_; 588 ++shared_timer_suspended_;
597 } 589 }
598 590
599 void WebKitClientImpl::ResumeSharedTimer() { 591 void WebKitClientImpl::ResumeSharedTimer() {
600 // The shared timer may have fired or been adjusted while we were suspended. 592 // The shared timer may have fired or been adjusted while we were suspended.
601 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) 593 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
602 setSharedTimerFireTime(shared_timer_fire_time_); 594 setSharedTimerFireTime(shared_timer_fire_time_);
603 } 595 }
604 596
605 } // namespace webkit_glue 597 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkitclient_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698