| 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/chromeos/dom_ui/menu_ui.h" | 5 #include "chrome/browser/chromeos/dom_ui/menu_ui.h" |
| 6 | 6 |
| 7 #include "app/menus/menu_model.h" | 7 #include "app/menus/menu_model.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 Singleton<ChromeURLDataManager>::get(), | 568 Singleton<ChromeURLDataManager>::get(), |
| 569 &ChromeURLDataManager::AddDataSource, | 569 &ChromeURLDataManager::AddDataSource, |
| 570 make_scoped_refptr(CreateDataSource()))); | 570 make_scoped_refptr(CreateDataSource()))); |
| 571 } | 571 } |
| 572 | 572 |
| 573 MenuUI::MenuUI(TabContents* contents, ChromeURLDataManager::DataSource* source) | 573 MenuUI::MenuUI(TabContents* contents, ChromeURLDataManager::DataSource* source) |
| 574 : DOMUI(contents) { | 574 : DOMUI(contents) { |
| 575 MenuHandler* handler = new MenuHandler(); | 575 MenuHandler* handler = new MenuHandler(); |
| 576 AddMessageHandler((handler)->Attach(this)); | 576 AddMessageHandler((handler)->Attach(this)); |
| 577 | 577 |
| 578 ChromeThread::PostTask( | 578 BrowserThread::PostTask( |
| 579 ChromeThread::IO, FROM_HERE, | 579 BrowserThread::IO, FROM_HERE, |
| 580 NewRunnableMethod( | 580 NewRunnableMethod( |
| 581 Singleton<ChromeURLDataManager>::get(), | 581 Singleton<ChromeURLDataManager>::get(), |
| 582 &ChromeURLDataManager::AddDataSource, | 582 &ChromeURLDataManager::AddDataSource, |
| 583 make_scoped_refptr(source))); | 583 make_scoped_refptr(source))); |
| 584 } | 584 } |
| 585 | 585 |
| 586 void MenuUI::ModelUpdated(const menus::MenuModel* model) { | 586 void MenuUI::ModelUpdated(const menus::MenuModel* model) { |
| 587 DictionaryValue json_model; | 587 DictionaryValue json_model; |
| 588 ListValue* items = new ListValue(); | 588 ListValue* items = new ListValue(); |
| 589 json_model.Set("items", items); | 589 json_model.Set("items", items); |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 662 | 662 |
| 663 ChromeURLDataManager::DataSource* MenuUI::CreateMenuUIHTMLSource( | 663 ChromeURLDataManager::DataSource* MenuUI::CreateMenuUIHTMLSource( |
| 664 const MenuUI& menu_ui, | 664 const MenuUI& menu_ui, |
| 665 const std::string& source_name, | 665 const std::string& source_name, |
| 666 const std::string& menu_class, | 666 const std::string& menu_class, |
| 667 int menu_source_id) { | 667 int menu_source_id) { |
| 668 return new MenuUIHTMLSource(menu_ui, source_name, menu_class, menu_source_id); | 668 return new MenuUIHTMLSource(menu_ui, source_name, menu_class, menu_source_id); |
| 669 } | 669 } |
| 670 | 670 |
| 671 } // namespace chromeos | 671 } // namespace chromeos |
| OLD | NEW |