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

Side by Side Diff: chrome/browser/chromeos/login/proxy_settings_dialog.cc

Issue 5790001: Remove parent window (dangling in background) for chrome://settings when invoked at OOBE screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/options/options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h" 5 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
6 6
7 #include "chrome/browser/chromeos/login/helper.h" 7 #include "chrome/browser/chromeos/login/helper.h"
8 #include "gfx/rect.h" 8 #include "gfx/rect.h"
9 #include "gfx/size.h" 9 #include "gfx/size.h"
10 10
11 namespace { 11 namespace {
12 12
13 // Hints for size of proxy settings dialog. 13 // Hints for size of proxy settings dialog.
14 const int kProxySettingsDialogReasonableWidth = 750; 14 const int kProxySettingsDialogReasonableWidth = 750;
15 const int kProxySettingsDialogReasonableHeight = 460; 15 const int kProxySettingsDialogReasonableHeight = 550;
16 const float kProxySettingsDialogReasonableWidthRatio = 0.4f; 16 const float kProxySettingsDialogReasonableWidthRatio = 0.4f;
17 const float kProxySettingsDialogReasonableHeightRatio = 0.4f; 17 const float kProxySettingsDialogReasonableHeightRatio = 0.4f;
18 18
19 const char kProxySettingsURL[] = "chrome://settings/proxy?menu=off"; 19 const char kProxySettingsURL[] = "chrome://settings/proxy?menu=off";
20 20
21 int calculate_size(int screen_size, int min_comfortable, float desired_ratio) { 21 int calculate_size(int screen_size, int min_comfortable, float desired_ratio) {
22 int desired_size = static_cast<int>(desired_ratio * screen_size); 22 int desired_size = static_cast<int>(desired_ratio * screen_size);
23 desired_size = std::max(min_comfortable, desired_size); 23 desired_size = std::max(min_comfortable, desired_size);
24 return std::min(screen_size, desired_size); 24 return std::min(screen_size, desired_size);
25 } 25 }
(...skipping 13 matching lines...) Expand all
39 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); 39 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
40 SetDialogSize(calculate_size(screen_bounds.width(), 40 SetDialogSize(calculate_size(screen_bounds.width(),
41 kProxySettingsDialogReasonableWidth, 41 kProxySettingsDialogReasonableWidth,
42 kProxySettingsDialogReasonableWidthRatio), 42 kProxySettingsDialogReasonableWidthRatio),
43 calculate_size(screen_bounds.height(), 43 calculate_size(screen_bounds.height(),
44 kProxySettingsDialogReasonableHeight, 44 kProxySettingsDialogReasonableHeight,
45 kProxySettingsDialogReasonableHeightRatio)); 45 kProxySettingsDialogReasonableHeightRatio));
46 } 46 }
47 47
48 } // namespace chromeos 48 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698