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/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/macros.h" | 13 #include "base/macros.h" |
14 #include "base/memory/ref_counted_memory.h" | 14 #include "base/memory/ref_counted_memory.h" |
15 #include "base/strings/string_number_conversions.h" | 15 #include "base/strings/string_number_conversions.h" |
16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
17 #include "base/values.h" | 17 #include "base/values.h" |
18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
19 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" |
20 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
21 #include "chrome/browser/win/enumerate_modules_model.h" | 21 #include "chrome/browser/win/enumerate_modules_model.h" |
22 #include "chrome/common/url_constants.h" | 22 #include "chrome/common/url_constants.h" |
| 23 #include "chrome/grit/browser_resources.h" |
23 #include "chrome/grit/chromium_strings.h" | 24 #include "chrome/grit/chromium_strings.h" |
24 #include "chrome/grit/generated_resources.h" | 25 #include "chrome/grit/generated_resources.h" |
| 26 #include "chrome/grit/theme_resources.h" |
| 27 #include "components/strings/grit/components_strings.h" |
25 #include "content/public/browser/notification_observer.h" | 28 #include "content/public/browser/notification_observer.h" |
26 #include "content/public/browser/notification_registrar.h" | 29 #include "content/public/browser/notification_registrar.h" |
27 #include "content/public/browser/notification_service.h" | 30 #include "content/public/browser/notification_service.h" |
28 #include "content/public/browser/user_metrics.h" | 31 #include "content/public/browser/user_metrics.h" |
29 #include "content/public/browser/web_contents.h" | 32 #include "content/public/browser/web_contents.h" |
30 #include "content/public/browser/web_ui.h" | 33 #include "content/public/browser/web_ui.h" |
31 #include "content/public/browser/web_ui_data_source.h" | 34 #include "content/public/browser/web_ui_data_source.h" |
32 #include "content/public/browser/web_ui_message_handler.h" | 35 #include "content/public/browser/web_ui_message_handler.h" |
33 #include "grit/browser_resources.h" | |
34 #include "grit/components_strings.h" | |
35 #include "grit/theme_resources.h" | |
36 #include "ui/base/l10n/l10n_util.h" | 36 #include "ui/base/l10n/l10n_util.h" |
37 #include "ui/base/layout.h" | 37 #include "ui/base/layout.h" |
38 #include "ui/base/resource/resource_bundle.h" | 38 #include "ui/base/resource/resource_bundle.h" |
39 | 39 |
40 using base::UserMetricsAction; | 40 using base::UserMetricsAction; |
41 using content::WebContents; | 41 using content::WebContents; |
42 using content::WebUIMessageHandler; | 42 using content::WebUIMessageHandler; |
43 | 43 |
44 namespace { | 44 namespace { |
45 | 45 |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 | 169 |
170 // static | 170 // static |
171 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes( | 171 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes( |
172 ui::ScaleFactor scale_factor) { | 172 ui::ScaleFactor scale_factor) { |
173 return static_cast<base::RefCountedMemory*>( | 173 return static_cast<base::RefCountedMemory*>( |
174 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 174 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
175 IDR_CONFLICT_FAVICON, scale_factor)); | 175 IDR_CONFLICT_FAVICON, scale_factor)); |
176 } | 176 } |
177 | 177 |
178 #endif | 178 #endif |
OLD | NEW |