chrome/browser/ui/views/app_list/app_list_dialog_contents_view.h - Issue 420323006: Merge 284648 "Changed AppListDialogContentsView to extend Dialog..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/app_list/app_list_dialog_contents_view.h

Issue 420323006: Merge 284648 "Changed AppListDialogContentsView to extend Dialog..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2062/src/

Patch Set: Created 6 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/views/app_list/app_list_dialog_contents_view.h

===================================================================

--- chrome/browser/ui/views/app_list/app_list_dialog_contents_view.h (revision 286013)

+++ chrome/browser/ui/views/app_list/app_list_dialog_contents_view.h (working copy)

@@ -6,7 +6,7 @@

#define CHROME_BROWSER_UI_VIEWS_APP_LIST_APP_LIST_DIALOG_CONTENTS_VIEW_H_

#include "ui/views/controls/button/button.h"

-#include "ui/views/widget/widget_delegate.h"

+#include "ui/views/window/dialog_delegate.h"

class AppListControllerDelegate;

@@ -17,7 +17,7 @@

// The contents view for an App List Dialog, which covers the entire app list

// and adds a close button.

-class AppListDialogContentsView : public views::WidgetDelegateView,

+class AppListDialogContentsView : public views::DialogDelegateView,

public views::ButtonListener {

public:

AppListDialogContentsView(

@@ -48,7 +48,6 @@

protected:

// Overridden from views::WidgetDelegate:

virtual ui::ModalType GetModalType() const OVERRIDE;

- virtual ui::AXRole GetAccessibleWindowRole() const OVERRIDE;

virtual void WindowClosing() OVERRIDE;

private:

« no previous file with comments | « no previous file | chrome/browser/ui/views/app_list/app_list_dialog_contents_view.cc » ('j') | no next file with comments »