chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc - Issue 10928017: Moving google_apis and GaiaClient to src/google_apis.

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

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head Created 8 years, 3 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/printing/cloud_print/cloud_print_setup_flow.h ('k') | chrome/browser/profiles/profile_downloader.h » ('j') | no next file with comments »

OLD	NEW
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/printing/cloud_print/cloud_print_setup_flow.h"	5 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"

6	6

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

8 #include "base/memory/singleton.h"	8 #include "base/memory/singleton.h"

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

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

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

12 #include "chrome/browser/prefs/pref_service.h"	12 #include "chrome/browser/prefs/pref_service.h"

13 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"	13 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"

14 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"	14 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"

15 #include "chrome/browser/printing/cloud_print/cloud_print_setup_message_handler. h"	15 #include "chrome/browser/printing/cloud_print/cloud_print_setup_message_handler. h"

16 #include "chrome/browser/printing/cloud_print/cloud_print_setup_source.h"	16 #include "chrome/browser/printing/cloud_print/cloud_print_setup_source.h"

17 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"	17 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"

18 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

19 #include "chrome/browser/service/service_process_control.h"	19 #include "chrome/browser/service/service_process_control.h"

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

21 #include "chrome/browser/ui/browser_dialogs.h"	21 #include "chrome/browser/ui/browser_dialogs.h"

22 #include "chrome/browser/ui/browser_finder.h"	22 #include "chrome/browser/ui/browser_finder.h"

23 #include "chrome/browser/ui/browser_window.h"	23 #include "chrome/browser/ui/browser_window.h"

24 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"	24 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"

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

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

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

28 #include "chrome/common/pref_names.h"	25 #include "chrome/common/pref_names.h"

29 #include "chrome/common/service_messages.h"	26 #include "chrome/common/service_messages.h"

30 #include "content/public/browser/browser_thread.h"	27 #include "content/public/browser/browser_thread.h"

31 #include "content/public/browser/render_view_host.h"	28 #include "content/public/browser/render_view_host.h"

32 #include "content/public/browser/web_contents.h"	29 #include "content/public/browser/web_contents.h"

33 #include "content/public/browser/web_ui.h"	30 #include "content/public/browser/web_ui.h"

	31 #include "google_apis/gaia/gaia_auth_fetcher.h"

	32 #include "google_apis/gaia/gaia_constants.h"

	33 #include "google_apis/gaia/google_service_auth_error.h"

34 #include "grit/chromium_strings.h"	34 #include "grit/chromium_strings.h"

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

36 #include "ui/base/l10n/l10n_font_util.h"	36 #include "ui/base/l10n/l10n_font_util.h"

37 #include "ui/gfx/font.h"	37 #include "ui/gfx/font.h"

38	38

39 using content::OpenURLParams;	39 using content::OpenURLParams;

40 using content::Referrer;	40 using content::Referrer;

41 using content::WebContents;	41 using content::WebContents;

42 using content::WebUIMessageHandler;	42 using content::WebUIMessageHandler;

43	43

(...skipping 290 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
334	334

335 void CloudPrintSetupFlow::ExecuteJavascriptInIFrame(	335 void CloudPrintSetupFlow::ExecuteJavascriptInIFrame(

336 const string16& iframe_xpath,	336 const string16& iframe_xpath,

337 const string16& js) {	337 const string16& js) {

338 if (web_ui_) {	338 if (web_ui_) {

339 content::RenderViewHost* rvh =	339 content::RenderViewHost* rvh =

340 web_ui_->GetWebContents()->GetRenderViewHost();	340 web_ui_->GetWebContents()->GetRenderViewHost();

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

342 }	342 }

343 }	343 }

OLD	NEW