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

Unified Diff: chrome/browser/first_run/try_chrome_dialog_view.cc

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 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/first_run/try_chrome_dialog_view.cc
diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc
index 7376e6e49e7ecc07f1dbfc5e2588fe144604f672..04d32b83e2a30ef88169ad0c525923cddc560967 100644
--- a/chrome/browser/first_run/try_chrome_dialog_view.cc
+++ b/chrome/browser/first_run/try_chrome_dialog_view.cc
@@ -16,6 +16,8 @@
#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"
@@ -31,11 +33,6 @@
#include "ui/views/layout/layout_constants.h"
#include "ui/views/widget/widget.h"
-#if defined(USE_AURA)
-#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host.h"
-#endif
-
namespace {
const wchar_t kHelpCenterUrl[] =
@@ -282,11 +279,7 @@ TryChromeDialogView::Result TryChromeDialogView::ShowModal(
// Carve the toast shape into the window.
HWND toast_window;
-#if defined(USE_AURA)
toast_window = popup_->GetNativeView()->GetHost()->GetAcceleratedWidget();
-#else
- toast_window = popup_->GetNativeView();
-#endif
SetToastRegion(toast_window, preferred.width(), preferred.height());
// Time to show the window in a modal loop.
« no previous file with comments | « chrome/browser/download/drag_download_item_views.cc ('k') | chrome/browser/ui/views/accelerator_utils_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698