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

Side by Side Diff: chrome/browser/ui/views/html_dialog_view.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 30 matching lines...) Expand all
41 public TabFirstRenderWatcher::Delegate { 41 public TabFirstRenderWatcher::Delegate {
42 public: 42 public:
43 HtmlDialogView(Profile* profile, HtmlDialogUIDelegate* delegate); 43 HtmlDialogView(Profile* profile, HtmlDialogUIDelegate* delegate);
44 virtual ~HtmlDialogView(); 44 virtual ~HtmlDialogView();
45 45
46 // Initializes the contents of the dialog (the DOMView and the callbacks). 46 // Initializes the contents of the dialog (the DOMView and the callbacks).
47 void InitDialog(); 47 void InitDialog();
48 48
49 // Overridden from views::View: 49 // Overridden from views::View:
50 virtual gfx::Size GetPreferredSize() OVERRIDE; 50 virtual gfx::Size GetPreferredSize() OVERRIDE;
51 virtual bool AcceleratorPressed(const views::Accelerator& accelerator) 51 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator)
52 OVERRIDE; 52 OVERRIDE;
53 virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child) 53 virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child)
54 OVERRIDE; 54 OVERRIDE;
55 55
56 // Overridden from views::WidgetDelegate: 56 // Overridden from views::WidgetDelegate:
57 virtual bool CanResize() const OVERRIDE; 57 virtual bool CanResize() const OVERRIDE;
58 virtual bool IsModal() const OVERRIDE; 58 virtual bool IsModal() const OVERRIDE;
59 virtual string16 GetWindowTitle() const OVERRIDE; 59 virtual string16 GetWindowTitle() const OVERRIDE;
60 virtual void WindowClosing() OVERRIDE; 60 virtual void WindowClosing() OVERRIDE;
61 virtual views::View* GetContentsView() OVERRIDE; 61 virtual views::View* GetContentsView() OVERRIDE;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 // This view is a delegate to the HTML content since it needs to get notified 107 // This view is a delegate to the HTML content since it needs to get notified
108 // about when the dialog is closing. For all other actions (besides dialog 108 // about when the dialog is closing. For all other actions (besides dialog
109 // closing) we delegate to the creator of this view, which we keep track of 109 // closing) we delegate to the creator of this view, which we keep track of
110 // using this variable. 110 // using this variable.
111 HtmlDialogUIDelegate* delegate_; 111 HtmlDialogUIDelegate* delegate_;
112 112
113 DISALLOW_COPY_AND_ASSIGN(HtmlDialogView); 113 DISALLOW_COPY_AND_ASSIGN(HtmlDialogView);
114 }; 114 };
115 115
116 #endif // CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_ 116 #endif // CHROME_BROWSER_UI_VIEWS_HTML_DIALOG_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble_views.cc ('k') | chrome/browser/ui/views/html_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698