diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 23:36:35 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 23:36:35 +0000 |
| commit | 99106ba4dad6f1b59bd923ac9b724c2932916417 (patch) | |
| tree | 10baac9a960bd863ed1f8458df227c1c011da866 /chrome/browser/browser_process_impl.cc | |
| parent | b1441686e178b7542085723bcd01998f2912a4a3 (diff) | |
| download | chromium_src-99106ba4dad6f1b59bd923ac9b724c2932916417.zip chromium_src-99106ba4dad6f1b59bd923ac9b724c2932916417.tar.gz chromium_src-99106ba4dad6f1b59bd923ac9b724c2932916417.tar.bz2 | |
Move winaura specific methods and members from chrome/browser/browser_process.h to chrome/browser/browser_process_platform_part_winaura.h
Precursor CL to https://codereview.chromium.org/14576015/
BUG=235648, 232842, 179830
Originally Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=200576
Reverted: http://crrev.com/200656
The cause of the issue is that the current paradigm is such that you can still include the header from the base class although the base class is ruled out in gyp... this resulted in a Heap Corruption debug check when deleting the TestingBrowserProcessPlatformPart on WinAura since it would take its definition from browser_process_platform_part.h at compile time, but use the impl from browser_process_platform_part_aurawin.h at runtime...
This paradigm is being fixed in https://codereview.chromium.org/14951007/ and thus simply #ifdefing the right definition in testing_browser_process_platform_part.h for now is fine.
Review URL: https://chromiumcodereview.appspot.com/14698027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 2906ce0..4e4b254 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -99,9 +99,6 @@ #if defined(OS_WIN) #include "base/win/windows_version.h" #include "ui/views/focus/view_storage.h" -#if defined(USE_AURA) -#include "chrome/browser/metro_viewer/metro_viewer_process_host_win.h" -#endif #elif defined(OS_MACOSX) #include "chrome/browser/chrome_browser_main_mac.h" #endif @@ -112,6 +109,8 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/browser_process_platform_part_chromeos.h" +#elif defined(OS_WIN) && defined(USE_AURA) +#include "chrome/browser/browser_process_platform_part_aurawin.h" #else #include "chrome/browser/browser_process_platform_part.h" #endif // defined(OS_CHROMEOS) @@ -634,12 +633,6 @@ BrowserProcessImpl::media_file_system_registry() { #endif } -#if !defined(OS_WIN) -void BrowserProcessImpl::PlatformSpecificCommandLineProcessing( - const CommandLine& command_line) { -} -#endif - bool BrowserProcessImpl::created_local_state() const { return created_local_state_; } |