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

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

Issue 9600036: Move Render(View|Widget)Host and associated classes to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to review comments. Created 8 years, 9 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
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 #include "chrome/browser/ui/views/html_dialog_view.h" 5 #include "chrome/browser/ui/views/html_dialog_view.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 12 matching lines...) Expand all
23 23
24 #if defined(TOOLKIT_USES_GTK) 24 #if defined(TOOLKIT_USES_GTK)
25 #include "ui/views/widget/native_widget_gtk.h" 25 #include "ui/views/widget/native_widget_gtk.h"
26 #endif 26 #endif
27 27
28 #if defined(USE_AURA) 28 #if defined(USE_AURA)
29 #include "ui/aura/event.h" 29 #include "ui/aura/event.h"
30 #include "ui/views/widget/native_widget_aura.h" 30 #include "ui/views/widget/native_widget_aura.h"
31 #endif 31 #endif
32 32
33 class RenderWidgetHost;
34
35 using content::WebContents; 33 using content::WebContents;
36 using content::WebUIMessageHandler; 34 using content::WebUIMessageHandler;
37 35
38 namespace browser { 36 namespace browser {
39 37
40 // Declared in browser_dialogs.h so that others don't need to depend on our .h. 38 // Declared in browser_dialogs.h so that others don't need to depend on our .h.
41 gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, 39 gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent,
42 Profile* profile, 40 Profile* profile,
43 Browser* browser, 41 Browser* browser,
44 HtmlDialogUIDelegate* delegate, 42 HtmlDialogUIDelegate* delegate,
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 tab_watcher_.reset(new TabRenderWatcher(web_contents, this)); 301 tab_watcher_.reset(new TabRenderWatcher(web_contents, this));
304 302
305 DOMView::LoadURL(GetDialogContentURL()); 303 DOMView::LoadURL(GetDialogContentURL());
306 } 304 }
307 305
308 void HtmlDialogView::RegisterDialogAccelerators() { 306 void HtmlDialogView::RegisterDialogAccelerators() {
309 // Pressing the ESC key will close the dialog. 307 // Pressing the ESC key will close the dialog.
310 AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false)); 308 AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false));
311 } 309 }
312 310
313 void HtmlDialogView::OnRenderHostCreated(RenderViewHost* host) { 311 void HtmlDialogView::OnRenderHostCreated(content::RenderViewHost* host) {
314 } 312 }
315 313
316 void HtmlDialogView::OnTabMainFrameLoaded() { 314 void HtmlDialogView::OnTabMainFrameLoaded() {
317 } 315 }
318 316
319 void HtmlDialogView::OnTabMainFrameRender() { 317 void HtmlDialogView::OnTabMainFrameRender() {
320 tab_watcher_.reset(); 318 tab_watcher_.reset();
321 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) 319 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
322 if (initialized_) { 320 if (initialized_) {
323 views::NativeWidgetGtk::UpdateFreezeUpdatesProperty( 321 views::NativeWidgetGtk::UpdateFreezeUpdatesProperty(
324 GTK_WINDOW(GetWidget()->GetNativeView()), false); 322 GTK_WINDOW(GetWidget()->GetNativeView()), false);
325 } 323 }
326 #endif 324 #endif
327 } 325 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/html_dialog_view.h ('k') | chrome/browser/ui/views/hung_renderer_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698