diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/views/constrained_window_win.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/views/constrained_window_win.cc')
| -rw-r--r-- | chrome/browser/views/constrained_window_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc index f997c3d..7fa1dc6 100644 --- a/chrome/browser/views/constrained_window_win.cc +++ b/chrome/browser/views/constrained_window_win.cc @@ -6,7 +6,7 @@ #include "app/resource_bundle.h" #include "app/win_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" @@ -564,7 +564,7 @@ views::NonClientFrameView* ConstrainedWindowWin::CreateFrameViewForWindow() { void ConstrainedWindowWin::FocusConstrainedWindow() { if ((!owner_->delegate() || - owner_->delegate()->ShouldFocusConstrainedWindow(owner_)) && + owner_->delegate()->ShouldFocusConstrainedWindow()) && GetDelegate() && GetDelegate()->GetInitiallyFocusedView()) { GetDelegate()->GetInitiallyFocusedView()->RequestFocus(); } |