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

Side by Side Diff: chrome/browser/browser_signin.cc

Issue 6532069: Reland "WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 5." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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 | « chrome/browser/browser_shutdown.cc ('k') | chrome/browser/chrome_plugin_host.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) 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/browser_signin.h" 5 #include "chrome/browser/browser_signin.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/singleton.h" 13 #include "base/singleton.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/browser_thread.h" 16 #include "chrome/browser/browser_thread.h"
17 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
18 #include "chrome/browser/dom_ui/constrained_html_ui.h"
19 #include "chrome/browser/dom_ui/html_dialog_ui.h"
20 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/renderer_host/render_view_host.h" 19 #include "chrome/browser/renderer_host/render_view_host.h"
23 #include "chrome/browser/sync/profile_sync_service.h" 20 #include "chrome/browser/sync/profile_sync_service.h"
24 #include "chrome/browser/sync/sync_setup_flow.h" 21 #include "chrome/browser/sync/sync_setup_flow.h"
25 #include "chrome/browser/tab_contents/tab_contents.h" 22 #include "chrome/browser/tab_contents/tab_contents.h"
23 #include "chrome/browser/webui/chrome_url_data_manager.h"
24 #include "chrome/browser/webui/constrained_html_ui.h"
25 #include "chrome/browser/webui/html_dialog_ui.h"
26 #include "chrome/browser/webui/web_ui_util.h" 26 #include "chrome/browser/webui/web_ui_util.h"
27 #include "chrome/common/jstemplate_builder.h" 27 #include "chrome/common/jstemplate_builder.h"
28 #include "chrome/common/notification_details.h" 28 #include "chrome/common/notification_details.h"
29 #include "chrome/common/notification_source.h" 29 #include "chrome/common/notification_source.h"
30 #include "chrome/common/notification_type.h" 30 #include "chrome/common/notification_type.h"
31 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
32 #include "chrome/common/url_constants.h" 32 #include "chrome/common/url_constants.h"
33 #include "grit/browser_resources.h" 33 #include "grit/browser_resources.h"
34 #include "ui/base/resource/resource_bundle.h" 34 #include "ui/base/resource/resource_bundle.h"
35 35
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 324
325 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) { 325 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) {
326 // TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog. 326 // TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog.
327 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS) 327 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS)
328 html_dialog_ui_delegate_ = CreateHtmlDialogUI(); 328 html_dialog_ui_delegate_ = CreateHtmlDialogUI();
329 ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_, 329 ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_,
330 html_dialog_ui_delegate_, 330 html_dialog_ui_delegate_,
331 tab_contents); 331 tab_contents);
332 #endif 332 #endif
333 } 333 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_shutdown.cc ('k') | chrome/browser/chrome_plugin_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698