diff options
author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-21 16:41:33 +0000 |
---|---|---|
committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-21 16:41:33 +0000 |
commit | 8a53ee044de003495430e48203c8606dbf9aa261 (patch) | |
tree | d6171016214fa15a4b586b008a5b75f0e0777a96 /chrome/common/temp_scaffolding_stubs.cpp | |
parent | 9c19aa146af6d80de43f00fd109a43bb8f018b24 (diff) | |
download | chromium_src-8a53ee044de003495430e48203c8606dbf9aa261.zip chromium_src-8a53ee044de003495430e48203c8606dbf9aa261.tar.gz chromium_src-8a53ee044de003495430e48203c8606dbf9aa261.tar.bz2 |
Get browser window showing using a Browser object and accompanying scaffolding. Adds browser window controller and shim from NSWindow to BrowserWindow.
Review URL: http://codereview.chromium.org/18368
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/temp_scaffolding_stubs.cpp')
-rw-r--r-- | chrome/common/temp_scaffolding_stubs.cpp | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/chrome/common/temp_scaffolding_stubs.cpp b/chrome/common/temp_scaffolding_stubs.cpp index af74d6d..3517c4f 100644 --- a/chrome/common/temp_scaffolding_stubs.cpp +++ b/chrome/common/temp_scaffolding_stubs.cpp @@ -8,6 +8,8 @@ #include "base/thread.h" #include "base/path_service.h" #include "base/singleton.h" +#include "chrome/browser/browser.h" +#include "chrome/browser/browser_shutdown.h" #include "chrome/browser/plugin_service.h" #include "chrome/browser/shell_integration.h" #include "chrome/common/chrome_constants.h" @@ -15,7 +17,9 @@ #include "chrome/common/pref_service.h" BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line) - : created_local_state_(), created_metrics_service_(), + : main_notification_service_(new NotificationService), + memory_model_(HIGH_MEMORY_MODEL), + created_local_state_(), created_metrics_service_(), created_profile_manager_() { g_browser_process = this; } @@ -94,7 +98,9 @@ bool BrowserInit::LaunchBrowserImpl(const CommandLine& parsed_command_line, int* return_code) { DCHECK(profile); - // LAUNCH BROWSER WITH PROFILE HERE! + // this code is a simplification of BrowserInit::LaunchWithProfile::Launch() + Browser* browser = Browser::Create(profile); + browser->window()->Show(); return true; } @@ -173,6 +179,7 @@ void RegisterAllPrefs(PrefService*, PrefService*) { } namespace browser_shutdown { void ReadLastShutdownInfo() { } void Shutdown() { } +void OnShutdownStarting(ShutdownType type) { } } void OpenFirstRunDialog(Profile* profile) { } @@ -202,3 +209,17 @@ void PluginService::SetChromePluginDataDir(const std::wstring& data_dir) { void InstallJankometer(const CommandLine&) { } + +//-------------------------------------------------------------------------- + +void Browser::InitCommandState() { +} + +void Browser::Observe(NotificationType type, + const NotificationSource& source, + const NotificationDetails& details) { +} + +LocationBarView* Browser::GetLocationBarView() const { + return window_->GetLocationBarView(); +} |