Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / set_as_default_browser_ui.cc

diff --git a/src/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/src/chrome/browser/ui/webui/set_as_default_browser_ui.cc
index 19b0b0a..6dbcd99 100644 (file)
--- a/src/chrome/browser/ui/webui/set_as_default_browser_ui.cc
+++ b/src/chrome/browser/ui/webui/set_as_default_browser_ui.cc
@@ -31,7 +31,6 @@
 #include "content/public/browser/browser_thread.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_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
@@ -154,7 +153,7 @@ void SetAsDefaultBrowserHandler::RegisterMessages() {
 void SetAsDefaultBrowserHandler::SetDefaultWebClientUIState(
     ShellIntegration::DefaultWebClientUIState state) {
   // The callback is expected to be invoked once the procedure has completed.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!set_default_returned_)
     return;
 
@@ -190,7 +189,7 @@ void SetAsDefaultBrowserHandler::HandleLaunchSetDefaultBrowserFlow(
 
 void SetAsDefaultBrowserHandler::ConcludeInteraction(
     MakeChromeDefaultResult interaction_result) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (response_delegate_)
     response_delegate_->SetDialogInteractionResult(interaction_result);
@@ -352,7 +351,7 @@ void SetAsDefaultBrowserDialogImpl::OnDialogClosed(
           browser_->tab_strip_model()->GetActiveWebContents();
       window->Show();
       if (contents)
-        contents->GetView()->SetInitialFocus();
+        contents->SetInitialFocus();
     }
   }
 
@@ -387,7 +386,7 @@ void SetAsDefaultBrowserDialogImpl::OnBrowserRemoved(Browser* browser) {
 
 void SetAsDefaultBrowserDialogImpl::
     AttemptImmersiveFirstRunRestartOnFileThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   // If the sentinel was created for this launch, remove it before restarting
   // in immersive mode so that the user is taken through the full first-run
@@ -413,7 +412,7 @@ SetAsDefaultBrowserUI::SetAsDefaultBrowserUI(content::WebUI* web_ui)
 
 // static
 void SetAsDefaultBrowserUI::Show(Profile* profile, Browser* browser) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   SetAsDefaultBrowserDialogImpl* dialog =
       new SetAsDefaultBrowserDialogImpl(profile, browser);
   dialog->ShowDialog();