diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 12:42:55 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 12:42:55 +0000 |
| commit | 8bf7d4efd88132e72609bbbd3e2b84c59dda0168 (patch) | |
| tree | eade5a417d5bc8bab78e5979c389f5fa811ef8d5 /chrome/browser/ui | |
| parent | 924dda5743b3f97b1a2358429dbbf3a48bdcd8fc (diff) | |
| download | chromium_src-8bf7d4efd88132e72609bbbd3e2b84c59dda0168.zip chromium_src-8bf7d4efd88132e72609bbbd3e2b84c59dda0168.tar.gz chromium_src-8bf7d4efd88132e72609bbbd3e2b84c59dda0168.tar.bz2 | |
More logs for crosbug.com/26646
BUG=chromium-os:26646
TEST=none
Review URL: http://codereview.chromium.org/9625024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/browser_init.cc | 24 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_frame.cc | 3 |
2 files changed, 24 insertions, 3 deletions
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 6c1fc47..7c71eb7 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -630,6 +630,10 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) { RegisterPnaclComponent(cus); } +#if defined(OS_CHROMEOS) + // crosbug.com/26446. + LOG(ERROR) << "RegisterComponentsForUpdate Start"; +#endif cus->Start(); } @@ -1694,16 +1698,26 @@ bool BrowserInit::ProcessCmdLineImpl( BrowserInit* browser_init) { DCHECK(last_used_profile); #if defined(OS_CHROMEOS) + const CommandLine::StringVector argv = command_line.argv(); + std::string cmd; + for (CommandLine::StringVector::const_iterator iter = argv.begin(); + iter != argv.end(); + ++iter) { + cmd += *iter + " "; + } // crosbug.com/26446. - LOG(ERROR) << "ProcessCmdLineImpl: process_startup" << process_startup - << ", channel id=" << command_line.GetSwitchValueASCII( - switches::kAutomationClientChannelID); + LOG(ERROR) << "ProcessCmdLineImpl: process_startup=" << process_startup + << ", cmd=" << cmd; #endif if (process_startup) { if (command_line.HasSwitch(switches::kDisablePromptOnRepost)) content::NavigationController::DisablePromptOnRepost(); +#if defined(OS_CHROMEOS) + // crosbug.com/26446. + LOG(ERROR) << "RegisterComponentsForUpdate"; +#endif RegisterComponentsForUpdate(command_line); // Look for the testing channel ID ONLY during process startup @@ -1733,6 +1747,10 @@ bool BrowserInit::ProcessCmdLineImpl( expected_tab_count = std::max(1, static_cast<int>(urls_to_open.size())); } +#if defined(OS_CHROMEOS) + // crosbug.com/26446. + LOG(ERROR) << "CreatingAutomationProvider"; +#endif if (!CreateAutomationProvider<TestingAutomationProvider>( testing_channel_id, last_used_profile, diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc index a35e21d..58e3554 100644 --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc @@ -68,6 +68,9 @@ void BrowserFrame::InitBrowserFrame() { params.type = views::Widget::InitParams::TYPE_PANEL; } else if (browser_view_->browser()->is_type_popup()) { #if defined(USE_AURA) + // Note: InitParams::TYPE_POPUP is currently used by transient windows + // which do not have a NonClientFrameView. Use TYPE_BUBBLE instead. + params.type = views::Widget::InitParams::TYPE_BUBBLE; // In compact mode there is no launcher, so we need to keep panels always // on top so they do not get lost. if (ash::Shell::GetInstance()->IsWindowModeCompact()) |