chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc - Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it.

Side by Side Diff: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed style nit Created 8 years, 8 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

« chrome/browser/ui/webui/chrome_url_data_manager_factory.cc ('K') | « chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | chrome/browser/ui/webui/media/media_internals_ui.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/chromeos/keyboard_overlay_ui.h"	5 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "base/values.h"	11 #include "base/values.h"

12 #include "chrome/browser/chromeos/input_method/input_method_manager.h"	12 #include "chrome/browser/chromeos/input_method/input_method_manager.h"

13 #include "chrome/browser/chromeos/input_method/xkeyboard.h"	13 #include "chrome/browser/chromeos/input_method/xkeyboard.h"

14 #include "chrome/browser/prefs/pref_service.h"	14 #include "chrome/browser/prefs/pref_service.h"

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

16 #include "chrome/browser/ui/browser_list.h"	16 #include "chrome/browser/ui/browser_list.h"

17 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"	17 #include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"

18 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"	18 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"

19 #include "chrome/common/jstemplate_builder.h"	19 #include "chrome/common/jstemplate_builder.h"

20 #include "chrome/common/pref_names.h"	20 #include "chrome/common/pref_names.h"

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

22 #include "content/public/browser/browser_thread.h"	22 #include "content/public/browser/browser_thread.h"

23 #include "content/public/browser/web_contents.h"	23 #include "content/public/browser/web_contents.h"

24 #include "content/public/browser/web_ui.h"	24 #include "content/public/browser/web_ui.h"

25 #include "content/public/browser/web_ui_message_handler.h"	25 #include "content/public/browser/web_ui_message_handler.h"

26 #include "grit/browser_resources.h"	26 #include "grit/browser_resources.h"

27 #include "grit/generated_resources.h"	27 #include "grit/generated_resources.h"

(...skipping 281 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
309 //	309 //

310 ////////////////////////////////////////////////////////////////////////////////	310 ////////////////////////////////////////////////////////////////////////////////

311	311

312 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)	312 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)

313 : HtmlDialogUI(web_ui) {	313 : HtmlDialogUI(web_ui) {

314 Profile* profile = Profile::FromWebUI(web_ui);	314 Profile* profile = Profile::FromWebUI(web_ui);

315 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);	315 KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);

316 web_ui->AddMessageHandler(handler);	316 web_ui->AddMessageHandler(handler);

317	317

318 // Set up the chrome://keyboardoverlay/ source.	318 // Set up the chrome://keyboardoverlay/ source.

319 profile->GetChromeURLDataManager()->AddDataSource(	319 ChromeURLDataManagerFactory::GetForProfile(profile)->

320 CreateKeyboardOverlayUIHTMLSource());	320 AddDataSource(CreateKeyboardOverlayUIHTMLSource());

321 }	321 }

OLD	NEW