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

Side by Side Diff: chrome/browser/ui/input_window_dialog_linux.cc

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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) 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 #include "chrome/browser/ui/input_window_dialog.h" 5 #include "chrome/browser/ui/input_window_dialog.h"
6 6
7 #include "base/logging.h"
7 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/ui/webui/chrome_web_ui.h" 9 #include "chrome/browser/ui/webui/chrome_web_ui.h"
9 #include "chrome/browser/ui/webui/input_window_dialog_webui.h" 10 #include "chrome/browser/ui/webui/input_window_dialog_webui.h"
10 11
11 #if !defined(USE_AURA) 12 #if !defined(USE_AURA)
12 #include "chrome/browser/ui/input_window_dialog_gtk.h" 13 #include "chrome/browser/ui/input_window_dialog_gtk.h"
13 #endif 14 #endif
14 15
15 InputWindowDialog* InputWindowDialog::Create( 16 InputWindowDialog* InputWindowDialog::Create(
16 gfx::NativeWindow parent, 17 gfx::NativeWindow parent,
(...skipping 16 matching lines...) Expand all
33 DCHECK_EQ(1U, label_contents_pairs.size()); 34 DCHECK_EQ(1U, label_contents_pairs.size());
34 return new InputWindowDialogGtk(parent, 35 return new InputWindowDialogGtk(parent,
35 UTF16ToUTF8(window_title), 36 UTF16ToUTF8(window_title),
36 UTF16ToUTF8(label_contents_pairs[0].first), 37 UTF16ToUTF8(label_contents_pairs[0].first),
37 UTF16ToUTF8(label_contents_pairs[0].second), 38 UTF16ToUTF8(label_contents_pairs[0].second),
38 delegate, 39 delegate,
39 type); 40 type);
40 } 41 }
41 #endif 42 #endif
42 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698