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

Side by Side Diff: chrome/browser/ui/webui/about_ui.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
OLDNEW
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 28 matching lines...) Expand all
39 #include "chrome/browser/net/url_fixer_upper.h" 39 #include "chrome/browser/net/url_fixer_upper.h"
40 #include "chrome/browser/plugin_prefs.h" 40 #include "chrome/browser/plugin_prefs.h"
41 #include "chrome/browser/profiles/profile.h" 41 #include "chrome/browser/profiles/profile.h"
42 #include "chrome/browser/profiles/profile_manager.h" 42 #include "chrome/browser/profiles/profile_manager.h"
43 #include "chrome/browser/ui/browser_dialogs.h" 43 #include "chrome/browser/ui/browser_dialogs.h"
44 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 44 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
45 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 45 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
46 #include "chrome/common/chrome_paths.h" 46 #include "chrome/common/chrome_paths.h"
47 #include "chrome/common/chrome_version_info.h" 47 #include "chrome/common/chrome_version_info.h"
48 #include "chrome/common/jstemplate_builder.h" 48 #include "chrome/common/jstemplate_builder.h"
49 #include "chrome/common/net/gaia/google_service_auth_error.h"
50 #include "chrome/common/render_messages.h" 49 #include "chrome/common/render_messages.h"
51 #include "chrome/common/url_constants.h" 50 #include "chrome/common/url_constants.h"
52 #include "content/public/browser/browser_thread.h" 51 #include "content/public/browser/browser_thread.h"
53 #include "content/public/browser/plugin_service.h" 52 #include "content/public/browser/plugin_service.h"
54 #include "content/public/browser/render_process_host.h" 53 #include "content/public/browser/render_process_host.h"
55 #include "content/public/browser/render_view_host.h" 54 #include "content/public/browser/render_view_host.h"
56 #include "content/public/browser/web_contents.h" 55 #include "content/public/browser/web_contents.h"
57 #include "content/public/browser/web_ui.h" 56 #include "content/public/browser/web_ui.h"
58 #include "content/public/browser/web_ui_message_handler.h" 57 #include "content/public/browser/web_ui_message_handler.h"
59 #include "content/public/common/content_client.h" 58 #include "content/public/common/content_client.h"
60 #include "content/public/common/process_type.h" 59 #include "content/public/common/process_type.h"
60 #include "google_apis/gaia/google_service_auth_error.h"
61 #include "googleurl/src/gurl.h" 61 #include "googleurl/src/gurl.h"
62 #include "grit/browser_resources.h" 62 #include "grit/browser_resources.h"
63 #include "grit/chromium_strings.h" 63 #include "grit/chromium_strings.h"
64 #include "grit/generated_resources.h" 64 #include "grit/generated_resources.h"
65 #include "grit/locale_settings.h" 65 #include "grit/locale_settings.h"
66 #include "net/base/escape.h" 66 #include "net/base/escape.h"
67 #include "net/base/net_util.h" 67 #include "net/base/net_util.h"
68 #include "ui/base/l10n/l10n_util.h" 68 #include "ui/base/l10n/l10n_util.h"
69 #include "ui/base/layout.h" 69 #include "ui/base/layout.h"
70 #include "ui/base/resource/resource_bundle.h" 70 #include "ui/base/resource/resource_bundle.h"
(...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after
1464 #endif 1464 #endif
1465 1465
1466 web_ui->AddMessageHandler(new VersionDOMHandler()); 1466 web_ui->AddMessageHandler(new VersionDOMHandler());
1467 1467
1468 ChromeURLDataManager::DataSource* source = 1468 ChromeURLDataManager::DataSource* source =
1469 new AboutUIHTMLSource(name, profile); 1469 new AboutUIHTMLSource(name, profile);
1470 if (source) { 1470 if (source) {
1471 ChromeURLDataManager::AddDataSource(profile, source); 1471 ChromeURLDataManager::AddDataSource(profile, source);
1472 } 1472 }
1473 } 1473 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698