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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 2127973002: Geolocation: change GeolocationDelegate to injected by content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "content/browser/time_zone_monitor.h" 64 #include "content/browser/time_zone_monitor.h"
65 #include "content/browser/utility_process_host_impl.h" 65 #include "content/browser/utility_process_host_impl.h"
66 #include "content/browser/webui/content_web_ui_controller_factory.h" 66 #include "content/browser/webui/content_web_ui_controller_factory.h"
67 #include "content/browser/webui/url_data_manager.h" 67 #include "content/browser/webui/url_data_manager.h"
68 #include "content/common/content_switches_internal.h" 68 #include "content/common/content_switches_internal.h"
69 #include "content/common/host_discardable_shared_memory_manager.h" 69 #include "content/common/host_discardable_shared_memory_manager.h"
70 #include "content/common/host_shared_bitmap_manager.h" 70 #include "content/common/host_shared_bitmap_manager.h"
71 #include "content/common/mojo/mojo_shell_connection_impl.h" 71 #include "content/common/mojo/mojo_shell_connection_impl.h"
72 #include "content/public/browser/browser_main_parts.h" 72 #include "content/public/browser/browser_main_parts.h"
73 #include "content/public/browser/content_browser_client.h" 73 #include "content/public/browser/content_browser_client.h"
74 #include "content/public/browser/geolocation_provider.h"
74 #include "content/public/browser/render_process_host.h" 75 #include "content/public/browser/render_process_host.h"
75 #include "content/public/browser/tracing_controller.h" 76 #include "content/public/browser/tracing_controller.h"
76 #include "content/public/common/content_client.h" 77 #include "content/public/common/content_client.h"
77 #include "content/public/common/content_switches.h" 78 #include "content/public/common/content_switches.h"
78 #include "content/public/common/main_function_params.h" 79 #include "content/public/common/main_function_params.h"
79 #include "content/public/common/result_codes.h" 80 #include "content/public/common/result_codes.h"
80 #include "device/battery/battery_status_service.h" 81 #include "device/battery/battery_status_service.h"
81 #include "media/base/media.h" 82 #include "media/base/media.h"
82 #include "media/base/user_input_monitor.h" 83 #include "media/base/user_input_monitor.h"
83 #include "media/midi/midi_manager.h" 84 #include "media/midi/midi_manager.h"
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get()); 673 base::MessageLoop::current()->AddTaskObserver(memory_observer_.get());
673 } 674 }
674 675
675 if (parsed_command_line_.HasSwitch( 676 if (parsed_command_line_.HasSwitch(
676 switches::kEnableAggressiveDOMStorageFlushing)) { 677 switches::kEnableAggressiveDOMStorageFlushing)) {
677 TRACE_EVENT0("startup", 678 TRACE_EVENT0("startup",
678 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay"); 679 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay");
679 DOMStorageArea::EnableAggressiveCommitDelay(); 680 DOMStorageArea::EnableAggressiveCommitDelay();
680 } 681 }
681 682
683 GeolocationProvider::SetGeolocationDelegate(
684 GetContentClient()->browser()->CreateGeolocationDelegate());
685
682 // Enable memory-infra dump providers. 686 // Enable memory-infra dump providers.
683 InitSkiaEventTracer(); 687 InitSkiaEventTracer();
684 tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( 688 tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess(
685 base::kNullProcessId); 689 base::kNullProcessId);
686 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 690 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
687 HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr); 691 HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr);
688 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 692 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
689 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); 693 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr);
690 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 694 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
691 sql::SqlMemoryDumpProvider::GetInstance(), "Sql", nullptr); 695 sql::SqlMemoryDumpProvider::GetInstance(), "Sql", nullptr);
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1516 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1513 audio_thread_->task_runner(); 1517 audio_thread_->task_runner();
1514 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1518 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1515 std::move(worker_task_runner), 1519 std::move(worker_task_runner),
1516 MediaInternals::GetInstance()); 1520 MediaInternals::GetInstance());
1517 } 1521 }
1518 CHECK(audio_manager_); 1522 CHECK(audio_manager_);
1519 } 1523 }
1520 1524
1521 } // namespace content 1525 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698