diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 16:37:02 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 16:37:02 +0000 |
| commit | 4b80464b1af78fe013c87b3de0e5cc00b01325b5 (patch) | |
| tree | 62e4b0f000a275e6ee58b3c868ad9143d48ba627 /chrome/browser/chrome_browser_main.cc | |
| parent | df09645fa6786c9ce6d753c798f20328394e74b9 (diff) | |
| download | chromium_src-4b80464b1af78fe013c87b3de0e5cc00b01325b5.zip chromium_src-4b80464b1af78fe013c87b3de0e5cc00b01325b5.tar.gz chromium_src-4b80464b1af78fe013c87b3de0e5cc00b01325b5.tar.bz2 | |
Revert 160144 - Add calls to inform gpu of browser window count
BUG=146448
TEST=None
Review URL: https://codereview.chromium.org/11026015
TBR=davemoore@chromium.org
Review URL: https://codereview.chromium.org/11030029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index f467e00..e504234 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -34,7 +34,6 @@ #include "chrome/browser/browser_process_impl.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/chrome_browser_main_extra_parts.h" -#include "chrome/browser/chrome_gpu_util.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_protocols.h" #include "chrome/browser/extensions/extension_service.h" @@ -930,7 +929,6 @@ void ChromeBrowserMainParts::PostProfileInit() { void ChromeBrowserMainParts::PreBrowserStart() { for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) chrome_extra_parts_[i]->PreBrowserStart(); - gpu_util::InstallBrowserMonitor(); } void ChromeBrowserMainParts::PostBrowserStart() { @@ -1396,7 +1394,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { std::vector<Profile*> last_opened_profiles = g_browser_process->profile_manager()->GetLastOpenedProfiles(); #endif - if (browser_creator_->Start(parsed_command_line(), FilePath(), profile_, last_opened_profiles, &result_code)) { #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) @@ -1529,8 +1526,6 @@ void ChromeBrowserMainParts::PostMainMessageLoopRun() { for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) chrome_extra_parts_[i]->PostMainMessageLoopRun(); - gpu_util::UninstallBrowserMonitor(); - #if defined(OS_WIN) // Log the search engine chosen on first run. Do this at shutdown, after any // changes are made from the first run bubble link, etc. |