Remove parent window (dangling in background) for chrome://settings when invoked at OOBE screen.

Set correct parent window for proxy settings: "under the hood", not "network settings".
Remove close button when invoked at OOBE screen because there already exists another close button.

BUG=chromium-os:10035
TEST=Manual

Review URL: http://codereview.chromium.org/5790001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69118 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 7 insertions, 3 deletions

diff --git a/chrome/browser/chromeos/login/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/proxy_settings_dialog.cc
index 69dc9c5..48865b85 100644
--- a/chrome/browser/chromeos/login/proxy_settings_dialog.cc
+++ b/chrome/browser/chromeos/login/proxy_settings_dialog.cc
@@ -12,7 +12,7 @@ namespace {
 
 // Hints for size of proxy settings dialog.
 const int kProxySettingsDialogReasonableWidth = 750;
-const int kProxySettingsDialogReasonableHeight = 460;
+const int kProxySettingsDialogReasonableHeight = 550;
 const float kProxySettingsDialogReasonableWidthRatio = 0.4f;
 const float kProxySettingsDialogReasonableHeightRatio = 0.4f;
 
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index 8ba7dd5..5a9f9b9 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -115,7 +115,7 @@ function load() {
   if (cr.isChromeOS) {
     OptionsPage.register(AccountsOptions.getInstance());
     OptionsPage.registerSubPage(ProxyOptions.getInstance(),
-                                InternetOptions.getInstance());
+                                AdvancedOptions.getInstance());
     OptionsPage.registerOverlay(new OptionsPage(
         'detailsInternetPage',
         'detailsInternetPage',
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index 2e5084d..20a640d 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -67,6 +67,10 @@ html[dir='rtl'] .close-subpage {
   left: 0;
 }
 
+html[hide-menu=true] .close-subpage {
+  display: none
+}
+
 .action-area {
   -webkit-box-orient: horizontal;
   -webkit-box-align: center;
diff --git a/chrome/browser/resources/options/options_page.js b/chrome/browser/resources/options/options_page.js
index 8044cfd..aa69415 100644
--- a/chrome/browser/resources/options/options_page.js
+++ b/chrome/browser/resources/options/options_page.js
@@ -70,7 +70,7 @@ cr.define('options', function() {
     for (var name in this.registeredSubPages) {
       var pageInfo = this.registeredSubPages[name];
       var match = name == pageName;
-      if (match)
+      if (match && document.documentElement.getAttribute('hide-menu') != 'true')
         pageInfo.parentPage.visible = true;
       pageInfo.page.visible = match;
     }