chrome/browser/ui/webui/about_ui.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

Side by Side Diff: chrome/browser/ui/webui/about_ui.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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/ui/website_settings/website_settings_ui.cc ('k') | chrome/browser/ui/webui/app_launcher_page_ui.cc » ('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/ui/webui/about_ui.h"	5 #include "chrome/browser/ui/webui/about_ui.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <string>	8 #include <string>

9 #include <utility>	9 #include <utility>

10 #include <vector>	10 #include <vector>

(...skipping 20 matching lines...) Expand all Loading...
31 #include "chrome/browser/browser_process.h"	31 #include "chrome/browser/browser_process.h"

32 #include "chrome/browser/defaults.h"	32 #include "chrome/browser/defaults.h"

33 #include "chrome/browser/memory_details.h"	33 #include "chrome/browser/memory_details.h"

34 #include "chrome/browser/net/predictor.h"	34 #include "chrome/browser/net/predictor.h"

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

36 #include "chrome/browser/profiles/profile_manager.h"	36 #include "chrome/browser/profiles/profile_manager.h"

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

38 #include "chrome/common/chrome_paths.h"	38 #include "chrome/common/chrome_paths.h"

39 #include "chrome/common/render_messages.h"	39 #include "chrome/common/render_messages.h"

40 #include "chrome/common/url_constants.h"	40 #include "chrome/common/url_constants.h"

	41 #include "chrome/grit/chromium_strings.h"

	42 #include "chrome/grit/generated_resources.h"

41 #include "content/public/browser/browser_thread.h"	43 #include "content/public/browser/browser_thread.h"

42 #include "content/public/browser/render_process_host.h"	44 #include "content/public/browser/render_process_host.h"

43 #include "content/public/browser/render_view_host.h"	45 #include "content/public/browser/render_view_host.h"

44 #include "content/public/browser/url_data_source.h"	46 #include "content/public/browser/url_data_source.h"

45 #include "content/public/browser/web_contents.h"	47 #include "content/public/browser/web_contents.h"

46 #include "content/public/common/content_client.h"	48 #include "content/public/common/content_client.h"

47 #include "content/public/common/process_type.h"	49 #include "content/public/common/process_type.h"

48 #include "google_apis/gaia/google_service_auth_error.h"	50 #include "google_apis/gaia/google_service_auth_error.h"

49 #include "grit/browser_resources.h"	51 #include "grit/browser_resources.h"

50 #include "grit/chromium_strings.h"

51 #include "grit/generated_resources.h"

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

53 #include "net/base/escape.h"	53 #include "net/base/escape.h"

54 #include "net/base/filename_util.h"	54 #include "net/base/filename_util.h"

55 #include "net/base/load_flags.h"	55 #include "net/base/load_flags.h"

56 #include "net/http/http_response_headers.h"	56 #include "net/http/http_response_headers.h"

57 #include "net/url_request/url_fetcher.h"	57 #include "net/url_request/url_fetcher.h"

58 #include "net/url_request/url_request_status.h"	58 #include "net/url_request/url_request_status.h"

59 #include "ui/base/l10n/l10n_util.h"	59 #include "ui/base/l10n/l10n_util.h"

60 #include "ui/base/resource/resource_bundle.h"	60 #include "ui/base/resource/resource_bundle.h"

61 #include "ui/base/webui/jstemplate_builder.h"	61 #include "ui/base/webui/jstemplate_builder.h"

(...skipping 1033 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1095 Profile* profile = Profile::FromWebUI(web_ui);	1095 Profile* profile = Profile::FromWebUI(web_ui);

1096	1096

1097 #if defined(ENABLE_THEMES)	1097 #if defined(ENABLE_THEMES)

1098 // Set up the chrome://theme/ source.	1098 // Set up the chrome://theme/ source.

1099 ThemeSource* theme = new ThemeSource(profile);	1099 ThemeSource* theme = new ThemeSource(profile);

1100 content::URLDataSource::Add(profile, theme);	1100 content::URLDataSource::Add(profile, theme);

1101 #endif	1101 #endif

1102	1102

1103 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile));	1103 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile));

1104 }	1104 }

OLD	NEW