OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/dom_ui/remoting_ui.h" | 5 #include "chrome/browser/dom_ui/remoting_ui.h" |
6 | 6 |
7 #include "base/singleton.h" | 7 #include "base/singleton.h" |
8 #include "chrome/browser/browser_thread.h" | 8 #include "chrome/browser/browser_thread.h" |
9 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" | 9 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" |
| 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/tab_contents/tab_contents.h" |
10 #include "chrome/common/url_constants.h" | 12 #include "chrome/common/url_constants.h" |
11 #include "grit/theme_resources.h" | 13 #include "grit/theme_resources.h" |
12 #include "ui/base/resource/resource_bundle.h" | 14 #include "ui/base/resource/resource_bundle.h" |
13 | 15 |
14 namespace { | 16 namespace { |
15 | 17 |
16 /////////////////////////////////////////////////////////////////////////////// | 18 /////////////////////////////////////////////////////////////////////////////// |
17 // | 19 // |
18 // RemotingHTMLSource | 20 // RemotingHTMLSource |
19 // | 21 // |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 /////////////////////////////////////////////////////////////////////////////// | 59 /////////////////////////////////////////////////////////////////////////////// |
58 // | 60 // |
59 // RemotingUI | 61 // RemotingUI |
60 // | 62 // |
61 /////////////////////////////////////////////////////////////////////////////// | 63 /////////////////////////////////////////////////////////////////////////////// |
62 | 64 |
63 RemotingUI::RemotingUI(TabContents* contents) : DOMUI(contents) { | 65 RemotingUI::RemotingUI(TabContents* contents) : DOMUI(contents) { |
64 RemotingUIHTMLSource* html_source = new RemotingUIHTMLSource(); | 66 RemotingUIHTMLSource* html_source = new RemotingUIHTMLSource(); |
65 | 67 |
66 // Set up the chrome://remoting source. | 68 // Set up the chrome://remoting source. |
67 BrowserThread::PostTask( | 69 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source); |
68 BrowserThread::IO, FROM_HERE, | |
69 NewRunnableMethod(ChromeURLDataManager::GetInstance(), | |
70 &ChromeURLDataManager::AddDataSource, | |
71 make_scoped_refptr(html_source))); | |
72 } | 70 } |
73 | 71 |
74 | 72 |
75 // static | 73 // static |
76 RefCountedMemory* RemotingUI::GetFaviconResourceBytes() { | 74 RefCountedMemory* RemotingUI::GetFaviconResourceBytes() { |
77 return ResourceBundle::GetSharedInstance(). | 75 return ResourceBundle::GetSharedInstance(). |
78 // TODO(garykac): Have custom remoting icon created. | 76 // TODO(garykac): Have custom remoting icon created. |
79 LoadDataResourceBytes(IDR_PLUGIN); | 77 LoadDataResourceBytes(IDR_PLUGIN); |
80 } | 78 } |
81 | 79 |
82 // static | 80 // static |
83 void RemotingUI::RegisterUserPrefs(PrefService* prefs) { | 81 void RemotingUI::RegisterUserPrefs(PrefService* prefs) { |
84 // TODO(garykac): Add remoting prefs (if needed). | 82 // TODO(garykac): Add remoting prefs (if needed). |
85 } | 83 } |
OLD | NEW |