#include "chrome/browser/ui/ash/ash_init.h"
#endif
+namespace {
+
// Minimum height of the visible part of a window.
const int kMinVisibleHeight = 30;
// Minimum width of the visible part of a window.
return false;
std::string window_name(chrome::GetWindowPlacementKey(browser_));
- const DictionaryValue* wp_pref =
+ const base::DictionaryValue* wp_pref =
browser_->profile()->GetPrefs()->GetDictionary(window_name.c_str());
int top = 0, left = 0, bottom = 0, right = 0;
bool maximized = false;
DISALLOW_COPY_AND_ASSIGN(DefaultStateProvider);
};
+class DefaultTargetDisplayProvider : public WindowSizer::TargetDisplayProvider {
+ public:
+ DefaultTargetDisplayProvider() {}
+ virtual ~DefaultTargetDisplayProvider() {}
+
+ virtual gfx::Display GetTargetDisplay(
+ const gfx::Screen* screen,
+ const gfx::Rect& bounds) const OVERRIDE {
+#if defined(USE_ASH)
+ // Use the target display on ash.
+ if (chrome::ShouldOpenAshOnStartup()) {
+ aura::Window* target = ash::Shell::GetTargetRootWindow();
+ return screen->GetDisplayNearestWindow(target);
+ }
+#endif
+ // Find the size of the work area of the monitor that intersects the bounds
+ // of the anchor window.
+ return screen->GetDisplayMatching(bounds);
+ }
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(DefaultTargetDisplayProvider);
+};
+
+} // namespace
+
///////////////////////////////////////////////////////////////////////////////
// WindowSizer, public:
-WindowSizer::WindowSizer(StateProvider* state_provider, const Browser* browser)
- : state_provider_(state_provider),
+WindowSizer::WindowSizer(
+ scoped_ptr<StateProvider> state_provider,
+ scoped_ptr<TargetDisplayProvider> target_display_provider,
+ const Browser* browser)
+ : state_provider_(state_provider.Pass()),
+ target_display_provider_(target_display_provider.Pass()),
// TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
screen_(gfx::Screen::GetNativeScreen()),
browser_(browser) {
}
-WindowSizer::WindowSizer(StateProvider* state_provider,
- gfx::Screen* screen,
- const Browser* browser)
- : state_provider_(state_provider),
+WindowSizer::WindowSizer(
+ scoped_ptr<StateProvider> state_provider,
+ scoped_ptr<TargetDisplayProvider> target_display_provider,
+ gfx::Screen* screen,
+ const Browser* browser)
+ : state_provider_(state_provider.Pass()),
+ target_display_provider_(target_display_provider.Pass()),
screen_(screen),
browser_(browser) {
DCHECK(screen_);
const Browser* browser,
gfx::Rect* window_bounds,
ui::WindowShowState* show_state) {
- const WindowSizer sizer(new DefaultStateProvider(app_name, browser), browser);
+ scoped_ptr<StateProvider> state_provider(
+ new DefaultStateProvider(app_name, browser));
+ scoped_ptr<TargetDisplayProvider> target_display_provider(
+ new DefaultTargetDisplayProvider);
+ const WindowSizer sizer(state_provider.Pass(),
+ target_display_provider.Pass(),
+ browser);
sizer.DetermineWindowBoundsAndShowState(specified_bounds,
window_bounds,
show_state);
// Pre-populate the window state with our default.
*show_state = GetWindowDefaultShowState();
*bounds = specified_bounds;
- if (bounds->IsEmpty()) {
+
#if defined(USE_ASH)
- // See if ash should decide the window placement.
- if (IsTabbedBrowserInAsh()) {
- GetTabbedBrowserBoundsAsh(bounds, show_state);
- return;
- } else if (chrome::ShouldOpenAshOnStartup() &&
- browser_ && browser_->host_desktop_type() ==
- chrome::HOST_DESKTOP_TYPE_ASH) {
- // In ash, saved show state takes precidence. If you have a
- // question or an issue, please contact oshima@chromium.org.
- GetSavedWindowBounds(bounds, show_state);
- }
+ // See if ash should decide the window placement.
+ if (GetBrowserBoundsAsh(bounds, show_state))
+ return;
#endif
+
+ if (bounds->IsEmpty()) {
// See if there's last active window's placement information.
- if (GetLastWindowBounds(bounds, show_state))
+ if (GetLastActiveWindowBounds(bounds, show_state))
return;
// See if there's saved placement information.
if (GetSavedWindowBounds(bounds, show_state))
return;
+
// No saved placement, figure out some sensible default size based on
// the user's screen size.
- GetDefaultWindowBounds(screen_->GetPrimaryDisplay(), bounds);
- } else {
-#if defined(USE_ASH)
- // In case of a popup with an 'unspecified' location in ash, we are
- // looking for a good screen location. We are interpreting (0,0) as an
- // unspecified location.
- if (IsPopupBrowserInAsh() && bounds->origin().IsOrigin()) {
- *bounds = ash::Shell::GetInstance()->window_positioner()->
- GetPopupPosition(*bounds);
- return;
- }
-#endif
- // In case that there was a bound given we need to make sure that it is
- // visible and fits on the screen.
- // Find the size of the work area of the monitor that intersects the bounds
- // of the anchor window. Note: AdjustBoundsToBeVisibleOnMonitorContaining
- // does not exactly what we want: It makes only sure that "a minimal part"
- // is visible on the screen.
- gfx::Rect work_area = screen_->GetDisplayMatching(*bounds).work_area();
- // Resize so that it fits.
- bounds->AdjustToFit(work_area);
+ GetDefaultWindowBounds(GetTargetDisplay(gfx::Rect()), bounds);
+ return;
}
+
+ // In case that there was a bound given we need to make sure that it is
+ // visible and fits on the screen.
+ // Find the size of the work area of the monitor that intersects the bounds
+ // of the anchor window. Note: AdjustBoundsToBeVisibleOnMonitorContaining
+ // does not exactly what we want: It makes only sure that "a minimal part"
+ // is visible on the screen.
+ gfx::Rect work_area = screen_->GetDisplayMatching(*bounds).work_area();
+ // Resize so that it fits.
+ bounds->AdjustToFit(work_area);
}
-bool WindowSizer::GetLastWindowBounds(gfx::Rect* bounds,
- ui::WindowShowState* show_state) const {
+bool WindowSizer::GetLastActiveWindowBounds(
+ gfx::Rect* bounds,
+ ui::WindowShowState* show_state) const {
DCHECK(bounds);
DCHECK(show_state);
if (!state_provider_.get() ||
return false;
gfx::Rect last_window_bounds = *bounds;
bounds->Offset(kWindowTilePixels, kWindowTilePixels);
- AdjustBoundsToBeVisibleOnMonitorContaining(last_window_bounds,
- gfx::Rect(),
- bounds);
+ AdjustBoundsToBeVisibleOnDisplay(screen_->GetDisplayMatching(*bounds),
+ gfx::Rect(),
+ bounds);
return true;
}
&saved_work_area,
show_state))
return false;
- AdjustBoundsToBeVisibleOnMonitorContaining(*bounds, saved_work_area, bounds);
+ AdjustBoundsToBeVisibleOnDisplay(GetTargetDisplay(*bounds),
+ saved_work_area,
+ bounds);
return true;
}
#if defined(USE_ASH)
// TODO(beng): insufficient but currently necessary. http://crbug.com/133312
if (chrome::ShouldOpenAshOnStartup()) {
- *default_bounds = ash::WindowPositioner::GetDefaultWindowBounds(
- display);
+ *default_bounds = ash::WindowPositioner::GetDefaultWindowBounds(display);
return;
}
#endif
default_width, default_height);
}
-void WindowSizer::AdjustBoundsToBeVisibleOnMonitorContaining(
- const gfx::Rect& other_bounds,
+void WindowSizer::AdjustBoundsToBeVisibleOnDisplay(
+ const gfx::Display& display,
const gfx::Rect& saved_work_area,
gfx::Rect* bounds) const {
DCHECK(bounds);
- // Find the size of the work area of the monitor that intersects the bounds
- // of the anchor window.
- gfx::Display display = screen_->GetDisplayMatching(other_bounds);
-
- // If height or width are 0, reset to the default size.
- gfx::Rect default_bounds;
- GetDefaultWindowBounds(display, &default_bounds);
- if (bounds->height() <= 0)
- bounds->set_height(default_bounds.height());
- if (bounds->width() <= 0)
- bounds->set_width(default_bounds.width());
+ // If |bounds| is empty, reset to the default size.
+ if (bounds->IsEmpty()) {
+ gfx::Rect default_bounds;
+ GetDefaultWindowBounds(display, &default_bounds);
+ if (bounds->height() <= 0)
+ bounds->set_height(default_bounds.height());
+ if (bounds->width() <= 0)
+ bounds->set_width(default_bounds.width());
+ }
// Ensure the minimum height and width.
bounds->set_height(std::max(kMinVisibleHeight, bounds->height()));
#endif // defined(OS_MACOSX)
}
+gfx::Display WindowSizer::GetTargetDisplay(const gfx::Rect& bounds) const {
+ return target_display_provider_->GetTargetDisplay(screen_, bounds);
+}
+
ui::WindowShowState WindowSizer::GetWindowDefaultShowState() const {
if (!browser_)
return ui::SHOW_STATE_DEFAULT;
// Otherwise we use the default which can be overridden later on.
return ui::SHOW_STATE_DEFAULT;
}
-
-#if defined(USE_ASH)
-bool WindowSizer::IsTabbedBrowserInAsh() const {
- // TODO(beng): insufficient but currently necessary. http://crbug.com/133312
- return chrome::ShouldOpenAshOnStartup() &&
- browser_ &&
- browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
- browser_->is_type_tabbed();
-}
-
-bool WindowSizer::IsPopupBrowserInAsh() const {
- // TODO(beng): insufficient but currently necessary. http://crbug.com/133312
- return chrome::ShouldOpenAshOnStartup() &&
- browser_ &&
- browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
- browser_->is_type_popup();
-}
-#endif
projects / platform / framework / web / crosswalk.git / blobdiff