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

Side by Side Diff: content/renderer/render_view.cc

Issue 6708059: Turn on client-side phishing detection for UMA users with SafeBrowsing enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 9 years, 8 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
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 "content/renderer/render_view.h" 5 #include "content/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 633
634 RenderThread* current_thread = RenderThread::current(); 634 RenderThread* current_thread = RenderThread::current();
635 SpellCheck* spellcheck = current_thread ? current_thread->spellchecker() : 0; 635 SpellCheck* spellcheck = current_thread ? current_thread->spellchecker() : 0;
636 spellcheck_provider_ = new SpellCheckProvider(this, spellcheck); 636 spellcheck_provider_ = new SpellCheckProvider(this, spellcheck);
637 637
638 if (CommandLine::ForCurrentProcess()->HasSwitch( 638 if (CommandLine::ForCurrentProcess()->HasSwitch(
639 switches::kEnableP2PApi)) { 639 switches::kEnableP2PApi)) {
640 p2p_socket_dispatcher_ = new P2PSocketDispatcher(this); 640 p2p_socket_dispatcher_ = new P2PSocketDispatcher(this);
641 } 641 }
642 642
643 if (CommandLine::ForCurrentProcess()->HasSwitch( 643 if (!CommandLine::ForCurrentProcess()->HasSwitch(
644 switches::kEnableClientSidePhishingDetection)) { 644 switches::kDisableClientSidePhishingDetection)) {
645 new safe_browsing::PhishingClassifierDelegate(this, NULL); 645 new safe_browsing::PhishingClassifierDelegate(this, NULL);
646 } 646 }
647 647
648 // Observer for Malware DOM details messages. 648 // Observer for Malware DOM details messages.
649 new safe_browsing::MalwareDOMDetails(this); 649 new safe_browsing::MalwareDOMDetails(this);
650 } 650 }
651 651
652 RenderView::~RenderView() { 652 RenderView::~RenderView() {
653 if (decrement_shared_popup_at_destruction_) 653 if (decrement_shared_popup_at_destruction_)
654 shared_popup_counter_->data--; 654 shared_popup_counter_->data--;
(...skipping 4739 matching lines...) Expand 10 before | Expand all | Expand 10 after
5394 const webkit_glue::CustomContextMenuContext& custom_context) { 5394 const webkit_glue::CustomContextMenuContext& custom_context) {
5395 if (custom_context.is_pepper_menu) 5395 if (custom_context.is_pepper_menu)
5396 pepper_delegate_.OnContextMenuClosed(custom_context); 5396 pepper_delegate_.OnContextMenuClosed(custom_context);
5397 else 5397 else
5398 context_menu_node_.reset(); 5398 context_menu_node_.reset();
5399 } 5399 }
5400 5400
5401 void RenderView::OnNetworkStateChanged(bool online) { 5401 void RenderView::OnNetworkStateChanged(bool online) {
5402 WebNetworkStateNotifier::setOnLine(online); 5402 WebNetworkStateNotifier::setOnLine(online);
5403 } 5403 }
OLDNEW
« chrome/browser/safe_browsing/safe_browsing_service.cc ('K') | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698