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

Side by Side Diff: ui/views/controls/webview/web_dialog_view.h

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/tree/tree_view.cc ('k') | ui/views/controls/webview/web_dialog_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // |handler| must not be NULL and this class takes the ownership. 45 // |handler| must not be NULL and this class takes the ownership.
46 WebDialogView(content::BrowserContext* context, 46 WebDialogView(content::BrowserContext* context,
47 ui::WebDialogDelegate* delegate, 47 ui::WebDialogDelegate* delegate,
48 WebContentsHandler* handler); 48 WebContentsHandler* handler);
49 virtual ~WebDialogView(); 49 virtual ~WebDialogView();
50 50
51 // For testing. 51 // For testing.
52 content::WebContents* web_contents(); 52 content::WebContents* web_contents();
53 53
54 // Overridden from views::ClientView: 54 // Overridden from views::ClientView:
55 virtual gfx::Size GetPreferredSize() OVERRIDE; 55 virtual gfx::Size GetPreferredSize() const OVERRIDE;
56 virtual gfx::Size GetMinimumSize() OVERRIDE; 56 virtual gfx::Size GetMinimumSize() const OVERRIDE;
57 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) 57 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator)
58 OVERRIDE; 58 OVERRIDE;
59 virtual void ViewHierarchyChanged( 59 virtual void ViewHierarchyChanged(
60 const ViewHierarchyChangedDetails& details) OVERRIDE; 60 const ViewHierarchyChangedDetails& details) OVERRIDE;
61 virtual bool CanClose() OVERRIDE; 61 virtual bool CanClose() OVERRIDE;
62 62
63 // Overridden from views::WidgetDelegate: 63 // Overridden from views::WidgetDelegate:
64 virtual bool CanResize() const OVERRIDE; 64 virtual bool CanResize() const OVERRIDE;
65 virtual ui::ModalType GetModalType() const OVERRIDE; 65 virtual ui::ModalType GetModalType() const OVERRIDE;
66 virtual base::string16 GetWindowTitle() const OVERRIDE; 66 virtual base::string16 GetWindowTitle() const OVERRIDE;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 // Whether CloseContents() has been called. 148 // Whether CloseContents() has been called.
149 bool close_contents_called_; 149 bool close_contents_called_;
150 150
151 DISALLOW_COPY_AND_ASSIGN(WebDialogView); 151 DISALLOW_COPY_AND_ASSIGN(WebDialogView);
152 }; 152 };
153 153
154 } // namespace views 154 } // namespace views
155 155
156 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ 156 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/tree/tree_view.cc ('k') | ui/views/controls/webview/web_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698