chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc - Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3].

Side by Side Diff: chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc

Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixes. Created 10 years, 1 month 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/net/predictor_api.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/printing/cloud_print/cloud_print_setup_flow.h"	5 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"

6	6

7 #include "app/gfx/font_util.h"	7 #include "app/gfx/font_util.h"

8 #include "base/json/json_writer.h"	8 #include "base/json/json_writer.h"

9 #include "base/singleton.h"	9 #include "base/singleton.h"

10 #include "base/string_util.h"	10 #include "base/string_util.h"

11 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

12 #include "base/values.h"	12 #include "base/values.h"

13 #include "chrome/browser/browser.h"

14 #include "chrome/browser/browser_list.h"	13 #include "chrome/browser/browser_list.h"

15 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"	14 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"

16 #include "chrome/browser/dom_ui/dom_ui_util.h"	15 #include "chrome/browser/dom_ui/dom_ui_util.h"

17 #if defined(TOOLKIT_GTK)	16 #if defined(TOOLKIT_GTK)

18 #include "chrome/browser/gtk/html_dialog_gtk.h"	17 #include "chrome/browser/gtk/html_dialog_gtk.h"

19 #endif // defined(TOOLKIT_GTK)	18 #endif // defined(TOOLKIT_GTK)

20 #include "chrome/browser/platform_util.h"	19 #include "chrome/browser/platform_util.h"

21 #include "chrome/browser/prefs/pref_service.h"	20 #include "chrome/browser/prefs/pref_service.h"

22 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"	21 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"

23 #include "chrome/browser/printing/cloud_print/cloud_print_setup_message_handler. h"	22 #include "chrome/browser/printing/cloud_print/cloud_print_setup_message_handler. h"

24 #include "chrome/browser/profile.h"	23 #include "chrome/browser/profile.h"

25 #include "chrome/browser/remoting/remoting_resources_source.h"	24 #include "chrome/browser/remoting/remoting_resources_source.h"

26 #include "chrome/browser/renderer_host/render_view_host.h"	25 #include "chrome/browser/renderer_host/render_view_host.h"

27 #include "chrome/browser/service/service_process_control.h"	26 #include "chrome/browser/service/service_process_control.h"

28 #include "chrome/browser/service/service_process_control_manager.h"	27 #include "chrome/browser/service/service_process_control_manager.h"

29 #include "chrome/browser/tab_contents/tab_contents.h"	28 #include "chrome/browser/tab_contents/tab_contents.h"

	29 #include "chrome/browser/ui/browser.h"

30 #if defined(TOOLKIT_VIEWS)	30 #if defined(TOOLKIT_VIEWS)

31 #include "chrome/browser/views/browser_dialogs.h"	31 #include "chrome/browser/views/browser_dialogs.h"

32 #endif // defined(TOOLKIT_GTK)	32 #endif // defined(TOOLKIT_GTK)

33 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"	33 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"

34 #include "chrome/common/net/gaia/gaia_constants.h"	34 #include "chrome/common/net/gaia/gaia_constants.h"

35 #include "chrome/common/net/gaia/google_service_auth_error.h"	35 #include "chrome/common/net/gaia/google_service_auth_error.h"

36 #include "chrome/common/pref_names.h"	36 #include "chrome/common/pref_names.h"

37 #include "chrome/common/service_messages.h"	37 #include "chrome/common/service_messages.h"

38 #include "gfx/font.h"	38 #include "gfx/font.h"

39 #include "grit/locale_settings.h"	39 #include "grit/locale_settings.h"

(...skipping 210 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
250 }	250 }

251	251

252 void CloudPrintSetupFlow::ExecuteJavascriptInIFrame(	252 void CloudPrintSetupFlow::ExecuteJavascriptInIFrame(

253 const std::wstring& iframe_xpath,	253 const std::wstring& iframe_xpath,

254 const std::wstring& js) {	254 const std::wstring& js) {

255 if (dom_ui_) {	255 if (dom_ui_) {

256 RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host();	256 RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host();

257 rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);	257 rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);

258 }	258 }

259 }	259 }

OLD	NEW