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

Unified Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h

Issue 1747773002: Make the ENABLE_APP_LIST build flag work on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2016 header Created 4 years, 10 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/views/apps/app_info_dialog/app_info_dialog_container.h
diff --git a/chrome/browser/ui/views/app_list/app_list_dialog_container.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h
similarity index 70%
rename from chrome/browser/ui/views/app_list/app_list_dialog_container.h
rename to chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h
index 089c3d043e99c4e7b8a7e0291fbdaef56aab802c..9df6623dc38d8017f3bbb275461f857fa530f808 100644
--- a/chrome/browser/ui/views/app_list/app_list_dialog_container.h
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_VIEWS_APP_LIST_APP_LIST_DIALOG_CONTAINER_H_
-#define CHROME_BROWSER_UI_VIEWS_APP_LIST_APP_LIST_DIALOG_CONTAINER_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_DIALOG_CONTAINER_
+#define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_DIALOG_CONTAINER_
#include "base/callback_forward.h"
#include "ui/gfx/geometry/size.h"
@@ -13,12 +13,14 @@ class DialogDelegateView;
class View;
}
+#if defined(ENABLE_APP_LIST)
// Creates a new dialog containing |view| that can be displayed inside the app
// list, covering the entire app list and adding a close button. Takes ownership
// of |view|.
views::DialogDelegateView* CreateAppListContainerForView(
views::View* view,
const base::Closure& close_callback);
+#endif
// Creates a new native dialog of the given |size| containing |view| with a
// close button and draggable titlebar. Takes ownership of |view|.
@@ -27,4 +29,4 @@ views::DialogDelegateView* CreateDialogContainerForView(
const gfx::Size& size,
const base::Closure& close_callback);
-#endif // CHROME_BROWSER_UI_VIEWS_APP_LIST_APP_LIST_DIALOG_CONTAINER_H_
+#endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_DIALOG_CONTAINER_

Powered by Google App Engine
This is Rietveld 408576698