Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / first_run / try_chrome_dialog_view.cc

diff --git a/src/chrome/browser/first_run/try_chrome_dialog_view.cc b/src/chrome/browser/first_run/try_chrome_dialog_view.cc
index 04d32b8..d9d95b5 100644 (file)
--- a/src/chrome/browser/first_run/try_chrome_dialog_view.cc
+++ b/src/chrome/browser/first_run/try_chrome_dialog_view.cc
@@ -10,17 +10,17 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/process_singleton.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/user_experiment.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
+#include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
@@ -86,7 +86,7 @@ TryChromeDialogView::Result TryChromeDialogView::ShowModal(
 
   // An approximate window size. After Layout() we'll get better bounds.
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
-  params.can_activate = true;
+  params.activatable = views::Widget::InitParams::ACTIVATABLE_YES;
   params.bounds = gfx::Rect(310, 200);
   popup_ = new views::Widget;
   popup_->Init(params);