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

Unified Diff: chrome/browser/ui/webui/set_as_default_browser_ui.cc

Issue 10696093: Hide the main window when Set-As-Default dialog is present. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a crash planted in the previous patch. Created 8 years, 5 months 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/webui/set_as_default_browser_ui.cc
diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
index 57f514306cdd95fd3a3f0c1f606c460943a15097..32927932ca24f98d991f04ec917e67aaaf716156 100644
--- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc
+++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/singleton_tabs.h"
@@ -25,6 +26,7 @@
#include "chrome/installer/util/install_util.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
+#include "content/public/browser/web_contents_view.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_message_handler.h"
#include "grit/browser_resources.h"
@@ -172,6 +174,19 @@ void SetAsDefaultBrowserHandler::ConcludeInteraction() {
Browser* browser = browser::FindBrowserWithWebContents(contents);
if (browser)
chrome::ShowSyncSetup(browser, SyncPromoUI::SOURCE_START_PAGE);
+ } else {
+ // For the purpose of showihng this dialog showing browsers was
+ // supressed. Now we have to get them shown.
+ for (BrowserList::const_iterator it = BrowserList::begin();
+ it != BrowserList::end(); ++it) {
cpu_(ooo_6.6-7.5) 2012/07/06 23:30:47 iterating over the browsers... Please ask jam@ if
jam 2012/07/12 18:38:40 that's fine. once we have different contexts for m
motek. 2012/08/08 14:28:35 Done.
motek. 2012/08/08 14:28:35 Thank for for the comment. Keeping the iteration.
+ BrowserWindow* window = NULL;
+ WebContents* other_contents = chrome::GetActiveWebContents(*it);
+ window = (*it)->window();
+ if (window && other_contents && other_contents != contents) {
+ window->Show();
+ other_contents->GetView()->SetInitialFocus();
+ }
+ }
}
delegate->CloseContents(contents);
}

Powered by Google App Engine
This is Rietveld 408576698