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/sessions_ui.h" | 5 #include "chrome/browser/ui/webui/sessions_ui.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/common/url_constants.h" | 21 #include "chrome/common/url_constants.h" |
22 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
23 #include "content/public/browser/web_ui.h" | 23 #include "content/public/browser/web_ui.h" |
24 #include "content/public/browser/web_ui_message_handler.h" | 24 #include "content/public/browser/web_ui_message_handler.h" |
25 #include "grit/browser_resources.h" | 25 #include "grit/browser_resources.h" |
26 #include "grit/chromium_strings.h" | 26 #include "grit/chromium_strings.h" |
27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
28 #include "grit/theme_resources.h" | 28 #include "grit/theme_resources.h" |
29 #include "grit/theme_resources_standard.h" | 29 #include "grit/theme_resources_standard.h" |
30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
| 31 #include "ui/base/layout.h" |
31 #include "ui/base/resource/resource_bundle.h" | 32 #include "ui/base/resource/resource_bundle.h" |
32 | 33 |
33 using content::WebContents; | 34 using content::WebContents; |
34 using content::WebUIMessageHandler; | 35 using content::WebUIMessageHandler; |
35 | 36 |
36 namespace { | 37 namespace { |
37 | 38 |
38 ChromeWebUIDataSource* CreateSessionsUIHTMLSource() { | 39 ChromeWebUIDataSource* CreateSessionsUIHTMLSource() { |
39 ChromeWebUIDataSource* source = | 40 ChromeWebUIDataSource* source = |
40 new ChromeWebUIDataSource(chrome::kChromeUISessionsHost); | 41 new ChromeWebUIDataSource(chrome::kChromeUISessionsHost); |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 web_ui->AddMessageHandler(new SessionsDOMHandler()); | 264 web_ui->AddMessageHandler(new SessionsDOMHandler()); |
264 | 265 |
265 // Set up the chrome://sessions/ source. | 266 // Set up the chrome://sessions/ source. |
266 Profile* profile = Profile::FromWebUI(web_ui); | 267 Profile* profile = Profile::FromWebUI(web_ui); |
267 ChromeURLDataManager::AddDataSource(profile, CreateSessionsUIHTMLSource()); | 268 ChromeURLDataManager::AddDataSource(profile, CreateSessionsUIHTMLSource()); |
268 } | 269 } |
269 | 270 |
270 // static | 271 // static |
271 base::RefCountedMemory* SessionsUI::GetFaviconResourceBytes() { | 272 base::RefCountedMemory* SessionsUI::GetFaviconResourceBytes() { |
272 return ResourceBundle::GetSharedInstance(). | 273 return ResourceBundle::GetSharedInstance(). |
273 LoadDataResourceBytes(IDR_HISTORY_FAVICON); | 274 LoadDataResourceBytes(IDR_HISTORY_FAVICON, |
| 275 ui::SCALE_FACTOR_100P); |
274 } | 276 } |
OLD | NEW |