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

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

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
« no previous file with comments | « ui/views/controls/tree/tree_view.h ('k') | ui/views/controls/webview/webview.h » ('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() const OVERRIDE; 55 virtual gfx::Size GetPreferredSize() const override;
56 virtual gfx::Size GetMinimumSize() const 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;
67 virtual std::string GetWindowName() const OVERRIDE; 67 virtual std::string GetWindowName() const override;
68 virtual void WindowClosing() OVERRIDE; 68 virtual void WindowClosing() override;
69 virtual views::View* GetContentsView() OVERRIDE; 69 virtual views::View* GetContentsView() override;
70 virtual ClientView* CreateClientView(views::Widget* widget) OVERRIDE; 70 virtual ClientView* CreateClientView(views::Widget* widget) override;
71 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 71 virtual views::View* GetInitiallyFocusedView() override;
72 virtual bool ShouldShowWindowTitle() const OVERRIDE; 72 virtual bool ShouldShowWindowTitle() const override;
73 virtual views::Widget* GetWidget() OVERRIDE; 73 virtual views::Widget* GetWidget() override;
74 virtual const views::Widget* GetWidget() const OVERRIDE; 74 virtual const views::Widget* GetWidget() const override;
75 75
76 // Overridden from ui::WebDialogDelegate: 76 // Overridden from ui::WebDialogDelegate:
77 virtual ui::ModalType GetDialogModalType() const OVERRIDE; 77 virtual ui::ModalType GetDialogModalType() const override;
78 virtual base::string16 GetDialogTitle() const OVERRIDE; 78 virtual base::string16 GetDialogTitle() const override;
79 virtual GURL GetDialogContentURL() const OVERRIDE; 79 virtual GURL GetDialogContentURL() const override;
80 virtual void GetWebUIMessageHandlers( 80 virtual void GetWebUIMessageHandlers(
81 std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; 81 std::vector<content::WebUIMessageHandler*>* handlers) const override;
82 virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; 82 virtual void GetDialogSize(gfx::Size* size) const override;
83 virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE; 83 virtual void GetMinimumDialogSize(gfx::Size* size) const override;
84 virtual std::string GetDialogArgs() const OVERRIDE; 84 virtual std::string GetDialogArgs() const override;
85 virtual void OnDialogShown( 85 virtual void OnDialogShown(
86 content::WebUI* webui, 86 content::WebUI* webui,
87 content::RenderViewHost* render_view_host) OVERRIDE; 87 content::RenderViewHost* render_view_host) override;
88 virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; 88 virtual void OnDialogClosed(const std::string& json_retval) override;
89 virtual void OnDialogCloseFromWebUI( 89 virtual void OnDialogCloseFromWebUI(
90 const std::string& json_retval) OVERRIDE; 90 const std::string& json_retval) override;
91 virtual void OnCloseContents(content::WebContents* source, 91 virtual void OnCloseContents(content::WebContents* source,
92 bool* out_close_dialog) OVERRIDE; 92 bool* out_close_dialog) override;
93 virtual bool ShouldShowDialogTitle() const OVERRIDE; 93 virtual bool ShouldShowDialogTitle() const override;
94 virtual bool HandleContextMenu( 94 virtual bool HandleContextMenu(
95 const content::ContextMenuParams& params) OVERRIDE; 95 const content::ContextMenuParams& params) override;
96 96
97 // Overridden from content::WebContentsDelegate: 97 // Overridden from content::WebContentsDelegate:
98 virtual void MoveContents(content::WebContents* source, 98 virtual void MoveContents(content::WebContents* source,
99 const gfx::Rect& pos) OVERRIDE; 99 const gfx::Rect& pos) override;
100 virtual void HandleKeyboardEvent( 100 virtual void HandleKeyboardEvent(
101 content::WebContents* source, 101 content::WebContents* source,
102 const content::NativeWebKeyboardEvent& event) OVERRIDE; 102 const content::NativeWebKeyboardEvent& event) override;
103 virtual void CloseContents(content::WebContents* source) OVERRIDE; 103 virtual void CloseContents(content::WebContents* source) override;
104 virtual content::WebContents* OpenURLFromTab( 104 virtual content::WebContents* OpenURLFromTab(
105 content::WebContents* source, 105 content::WebContents* source,
106 const content::OpenURLParams& params) OVERRIDE; 106 const content::OpenURLParams& params) override;
107 virtual void AddNewContents(content::WebContents* source, 107 virtual void AddNewContents(content::WebContents* source,
108 content::WebContents* new_contents, 108 content::WebContents* new_contents,
109 WindowOpenDisposition disposition, 109 WindowOpenDisposition disposition,
110 const gfx::Rect& initial_pos, 110 const gfx::Rect& initial_pos,
111 bool user_gesture, 111 bool user_gesture,
112 bool* was_blocked) OVERRIDE; 112 bool* was_blocked) override;
113 virtual void LoadingStateChanged(content::WebContents* source, 113 virtual void LoadingStateChanged(content::WebContents* source,
114 bool to_different_document) OVERRIDE; 114 bool to_different_document) override;
115 virtual void BeforeUnloadFired(content::WebContents* tab, 115 virtual void BeforeUnloadFired(content::WebContents* tab,
116 bool proceed, 116 bool proceed,
117 bool* proceed_to_fire_unload) OVERRIDE; 117 bool* proceed_to_fire_unload) override;
118 118
119 private: 119 private:
120 FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered); 120 FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered);
121 121
122 // Initializes the contents of the dialog. 122 // Initializes the contents of the dialog.
123 void InitDialog(); 123 void InitDialog();
124 124
125 // This view is a delegate to the HTML content since it needs to get notified 125 // This view is a delegate to the HTML content since it needs to get notified
126 // about when the dialog is closing. For all other actions (besides dialog 126 // about when the dialog is closing. For all other actions (besides dialog
127 // closing) we delegate to the creator of this view, which we keep track of 127 // closing) we delegate to the creator of this view, which we keep track of
(...skipping 19 matching lines...) Expand all
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.h ('k') | ui/views/controls/webview/webview.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698