Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1464)

Unified Diff: chrome/browser/ui/window_sizer/window_sizer_ash.cc

Issue 102773002: Open non browser window on the target display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: exclude win7 Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/window_sizer/window_sizer_ash.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
index 59a3035e5dcd0e4039ef88c71948698f19d0cf83..3ad703f2f392b29b444a50ffb9146616232469c1 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/window_sizer/window_sizer.h"
+#include "ash/shell.h"
#include "ash/wm/window_positioner.h"
#include "ash/wm/window_state.h"
#include "chrome/browser/ui/browser.h"
@@ -23,11 +24,16 @@ void WindowSizer::GetTabbedBrowserBoundsAsh(
ui::WindowShowState passed_show_state = *show_state;
bool is_saved_bounds = GetSavedWindowBounds(bounds_in_screen, show_state);
- // If there is no saved bounds (hence bounds_in_screen is empty), the
- // |display| will be the primary display.
- const gfx::Display& display = screen_->GetDisplayMatching(*bounds_in_screen);
- if (!is_saved_bounds)
+ gfx::Display display;
+ if (is_saved_bounds) {
+ display = screen_->GetDisplayMatching(*bounds_in_screen);
+ } else {
+ // If there is no saved bounds (hence bounds_in_screen is empty), use the
+ // target display.
+ display = target_display_provider_->GetTargetDisplay(screen_,
+ *bounds_in_screen);
*bounds_in_screen = ash::WindowPositioner::GetDefaultWindowBounds(display);
+ }
if (browser_->is_session_restore()) {
// This is a fall-through case when there is no bounds recorded
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698