Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 452 return render_view->CreatePepperPlugin( | 452 return render_view->CreatePepperPlugin( |
| 453 frame, params, info.path, pepper_module.get()); | 453 frame, params, info.path, pepper_module.get()); |
| 454 } | 454 } |
| 455 return NULL; | 455 return NULL; |
| 456 } | 456 } |
| 457 | 457 |
| 458 return render_view->CreateNPAPIPlugin( | 458 return render_view->CreateNPAPIPlugin( |
| 459 frame, params, info.path, actual_mime_type); | 459 frame, params, info.path, actual_mime_type); |
| 460 } | 460 } |
| 461 | 461 |
| 462 observer->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource); | 462 observer->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, |
| 463 resource, plugin_setting); | |
|
jochen (gone - plz use gerrit)
2011/08/10 15:12:03
why not record the UMA here?
Bernhard Bauer
2011/08/10 15:16:45
UserMetrics is in content/browser/ :-/
| |
| 463 if (plugin_setting == CONTENT_SETTING_ASK) { | 464 if (plugin_setting == CONTENT_SETTING_ASK) { |
| 464 return CreatePluginPlaceholder( | 465 return CreatePluginPlaceholder( |
| 465 render_view, frame, params, *group, IDR_CLICK_TO_PLAY_PLUGIN_HTML, | 466 render_view, frame, params, *group, IDR_CLICK_TO_PLAY_PLUGIN_HTML, |
| 466 IDS_PLUGIN_LOAD, false, true); | 467 IDS_PLUGIN_LOAD, false, true); |
| 467 } else { | 468 } else { |
| 468 return CreatePluginPlaceholder( | 469 return CreatePluginPlaceholder( |
| 469 render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML, | 470 render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML, |
| 470 IDS_PLUGIN_BLOCKED, false, true); | 471 IDS_PLUGIN_BLOCKED, false, true); |
| 471 } | 472 } |
| 472 } | 473 } |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 698 if (spellcheck_.get()) | 699 if (spellcheck_.get()) |
| 699 thread->RemoveObserver(spellcheck_.get()); | 700 thread->RemoveObserver(spellcheck_.get()); |
| 700 SpellCheck* new_spellcheck = new SpellCheck(); | 701 SpellCheck* new_spellcheck = new SpellCheck(); |
| 701 if (spellcheck_provider_) | 702 if (spellcheck_provider_) |
| 702 spellcheck_provider_->SetSpellCheck(new_spellcheck); | 703 spellcheck_provider_->SetSpellCheck(new_spellcheck); |
| 703 spellcheck_.reset(new_spellcheck); | 704 spellcheck_.reset(new_spellcheck); |
| 704 thread->AddObserver(new_spellcheck); | 705 thread->AddObserver(new_spellcheck); |
| 705 } | 706 } |
| 706 | 707 |
| 707 } // namespace chrome | 708 } // namespace chrome |
| OLD | NEW |