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

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

Issue 8986007: Move WebUIMessageHandler to its own file in the public directory and put it in the content namesp... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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) 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/ui/webui/conflicts_ui.h" 5 #include "chrome/browser/ui/webui/conflicts_ui.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/enumerate_modules_model_win.h" 16 #include "chrome/browser/enumerate_modules_model_win.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 18 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
19 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 19 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
20 #include "chrome/common/chrome_notification_types.h" 20 #include "chrome/common/chrome_notification_types.h"
21 #include "chrome/common/url_constants.h" 21 #include "chrome/common/url_constants.h"
22 #include "content/public/browser/notification_observer.h" 22 #include "content/public/browser/notification_observer.h"
23 #include "content/public/browser/notification_registrar.h" 23 #include "content/public/browser/notification_registrar.h"
24 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
25 #include "content/public/browser/user_metrics.h" 25 #include "content/public/browser/user_metrics.h"
26 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
27 #include "content/public/browser/web_ui_message_handler.h"
27 #include "grit/browser_resources.h" 28 #include "grit/browser_resources.h"
28 #include "grit/chromium_strings.h" 29 #include "grit/chromium_strings.h"
29 #include "grit/generated_resources.h" 30 #include "grit/generated_resources.h"
30 #include "grit/theme_resources.h" 31 #include "grit/theme_resources.h"
31 #include "grit/theme_resources_standard.h" 32 #include "grit/theme_resources_standard.h"
32 #include "ui/base/l10n/l10n_util.h" 33 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/resource/resource_bundle.h" 34 #include "ui/base/resource/resource_bundle.h"
34 35
35 using content::UserMetricsAction; 36 using content::UserMetricsAction;
36 using content::WebContents; 37 using content::WebContents;
38 using content::WebUIMessageHandler;
37 39
38 namespace { 40 namespace {
39 41
40 ChromeWebUIDataSource* CreateConflictsUIHTMLSource() { 42 ChromeWebUIDataSource* CreateConflictsUIHTMLSource() {
41 ChromeWebUIDataSource* source = 43 ChromeWebUIDataSource* source =
42 new ChromeWebUIDataSource(chrome::kChromeUIConflictsHost); 44 new ChromeWebUIDataSource(chrome::kChromeUIConflictsHost);
43 45
44 source->AddLocalizedString("loadingMessage", IDS_CONFLICTS_LOADING_MESSAGE); 46 source->AddLocalizedString("loadingMessage", IDS_CONFLICTS_LOADING_MESSAGE);
45 source->AddLocalizedString("modulesLongTitle", 47 source->AddLocalizedString("modulesLongTitle",
46 IDS_CONFLICTS_CHECK_PAGE_TITLE_LONG); 48 IDS_CONFLICTS_CHECK_PAGE_TITLE_LONG);
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 CreateConflictsUIHTMLSource()); 169 CreateConflictsUIHTMLSource());
168 } 170 }
169 171
170 // static 172 // static
171 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { 173 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
172 return ResourceBundle::GetSharedInstance(). 174 return ResourceBundle::GetSharedInstance().
173 LoadDataResourceBytes(IDR_CONFLICT_FAVICON); 175 LoadDataResourceBytes(IDR_CONFLICT_FAVICON);
174 } 176 }
175 177
176 #endif 178 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/collected_cookies_ui_delegate.cc ('k') | chrome/browser/ui/webui/constrained_html_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698