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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2393513004: Convert app banners to use Mojo. (Closed)
Patch Set: Fix Win clang compile Created 4 years, 2 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
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 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 12 matching lines...) Expand all
23 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
24 #include "base/strings/string_split.h" 24 #include "base/strings/string_split.h"
25 #include "base/strings/string_util.h" 25 #include "base/strings/string_util.h"
26 #include "base/strings/stringprintf.h" 26 #include "base/strings/stringprintf.h"
27 #include "base/strings/utf_string_conversions.h" 27 #include "base/strings/utf_string_conversions.h"
28 #include "base/threading/sequenced_worker_pool.h" 28 #include "base/threading/sequenced_worker_pool.h"
29 #include "base/threading/thread_task_runner_handle.h" 29 #include "base/threading/thread_task_runner_handle.h"
30 #include "build/build_config.h" 30 #include "build/build_config.h"
31 #include "chrome/browser/after_startup_task_utils.h" 31 #include "chrome/browser/after_startup_task_utils.h"
32 #include "chrome/browser/apps/app_url_redirector.h" 32 #include "chrome/browser/apps/app_url_redirector.h"
33 #include "chrome/browser/banners/app_banner_manager.h"
33 #include "chrome/browser/browser_about_handler.h" 34 #include "chrome/browser/browser_about_handler.h"
34 #include "chrome/browser/browser_process.h" 35 #include "chrome/browser/browser_process.h"
35 #include "chrome/browser/browser_shutdown.h" 36 #include "chrome/browser/browser_shutdown.h"
36 #include "chrome/browser/browsing_data/browsing_data_helper.h" 37 #include "chrome/browser/browsing_data/browsing_data_helper.h"
37 #include "chrome/browser/browsing_data/browsing_data_remover.h" 38 #include "chrome/browser/browsing_data/browsing_data_remover.h"
38 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" 39 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
39 #include "chrome/browser/browsing_data/origin_filter_builder.h" 40 #include "chrome/browser/browsing_data/origin_filter_builder.h"
40 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h" 41 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h"
41 #include "chrome/browser/budget_service/budget_service_impl.h" 42 #include "chrome/browser/budget_service/budget_service_impl.h"
42 #include "chrome/browser/character_encoding.h" 43 #include "chrome/browser/character_encoding.h"
(...skipping 2939 matching lines...) Expand 10 before | Expand all | Expand 10 after
2982 base::Bind(&bluetooth::Adapter::Create)); 2983 base::Bind(&bluetooth::Adapter::Create));
2983 2984
2984 if (!render_frame_host->GetParent()) { 2985 if (!render_frame_host->GetParent()) {
2985 // Register mojo CredentialManager interface only for main frame. 2986 // Register mojo CredentialManager interface only for main frame.
2986 registry->AddInterface( 2987 registry->AddInterface(
2987 base::Bind(&ChromePasswordManagerClient::BindCredentialManager, 2988 base::Bind(&ChromePasswordManagerClient::BindCredentialManager,
2988 render_frame_host)); 2989 render_frame_host));
2989 // Register mojo ContentTranslateDriver interface only for main frame. 2990 // Register mojo ContentTranslateDriver interface only for main frame.
2990 registry->AddInterface(base::Bind( 2991 registry->AddInterface(base::Bind(
2991 &ChromeTranslateClient::BindContentTranslateDriver, render_frame_host)); 2992 &ChromeTranslateClient::BindContentTranslateDriver, render_frame_host));
2993
2994 registry->AddInterface(base::Bind(
2995 &banners::AppBannerManager::BindToMojoRequest, render_frame_host));
2992 } 2996 }
2993 2997
2994 registry->AddInterface( 2998 registry->AddInterface(
2995 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver, 2999 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver,
2996 render_frame_host)); 3000 render_frame_host));
2997 3001
2998 registry->AddInterface( 3002 registry->AddInterface(
2999 base::Bind(&password_manager::ContentPasswordManagerDriverFactory:: 3003 base::Bind(&password_manager::ContentPasswordManagerDriverFactory::
3000 BindPasswordManagerDriver, 3004 BindPasswordManagerDriver,
3001 render_frame_host)); 3005 render_frame_host));
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
3277 if (channel <= kMaxDisableEncryptionChannel) { 3281 if (channel <= kMaxDisableEncryptionChannel) {
3278 static const char* const kWebRtcDevSwitchNames[] = { 3282 static const char* const kWebRtcDevSwitchNames[] = {
3279 switches::kDisableWebRtcEncryption, 3283 switches::kDisableWebRtcEncryption,
3280 }; 3284 };
3281 to_command_line->CopySwitchesFrom(from_command_line, 3285 to_command_line->CopySwitchesFrom(from_command_line,
3282 kWebRtcDevSwitchNames, 3286 kWebRtcDevSwitchNames,
3283 arraysize(kWebRtcDevSwitchNames)); 3287 arraysize(kWebRtcDevSwitchNames));
3284 } 3288 }
3285 } 3289 }
3286 #endif // defined(ENABLE_WEBRTC) 3290 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698