chrome/browser/chromeos/webui/menu_ui.cc - Issue 6594063: Update a bunch of files to the new location of browser_thread.h

Side by Side Diff: chrome/browser/chromeos/webui/menu_ui.cc

Issue 6594063: Update a bunch of files to the new location of browser_thread.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 9 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/webui/login/login_ui.cc ('k') | chrome/browser/chromeos/webui/mobile_setup_ui.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/webui/menu_ui.h"	5 #include "chrome/browser/chromeos/webui/menu_ui.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "base/callback.h"	9 #include "base/callback.h"

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

11 #include "base/json/json_writer.h"	11 #include "base/json/json_writer.h"

12 #include "base/message_loop.h"	12 #include "base/message_loop.h"

13 #include "base/singleton.h"	13 #include "base/singleton.h"

14 #include "base/string_number_conversions.h"	14 #include "base/string_number_conversions.h"

15 #include "base/string_piece.h"	15 #include "base/string_piece.h"

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

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

18 #include "base/weak_ptr.h"	18 #include "base/weak_ptr.h"

19 #include "chrome/browser/browser_thread.h"

20 #include "chrome/browser/chromeos/views/native_menu_webui.h"	19 #include "chrome/browser/chromeos/views/native_menu_webui.h"

21 #include "chrome/browser/chromeos/views/webui_menu_widget.h"	20 #include "chrome/browser/chromeos/views/webui_menu_widget.h"

22 #include "chrome/browser/profiles/profile.h"	21 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/tab_contents/tab_contents.h"

24 #include "chrome/browser/tab_contents/tab_contents_delegate.h"

25 #include "chrome/common/chrome_switches.h"	22 #include "chrome/common/chrome_switches.h"

26 #include "chrome/common/jstemplate_builder.h"	23 #include "chrome/common/jstemplate_builder.h"

27 #include "chrome/common/url_constants.h"	24 #include "chrome/common/url_constants.h"

	25 #include "content/browser/browser_thread.h"

	26 #include "content/browser/tab_contents/tab_contents.h"

	27 #include "content/browser/tab_contents/tab_contents_delegate.h"

28 #include "content/browser/webui/web_ui_util.h"	28 #include "content/browser/webui/web_ui_util.h"

29 #include "grit/app_resources.h"	29 #include "grit/app_resources.h"

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

31 #include "ui/base/models/menu_model.h"	31 #include "ui/base/models/menu_model.h"

32 #include "ui/base/resource/resource_bundle.h"	32 #include "ui/base/resource/resource_bundle.h"

33 #include "ui/gfx/canvas_skia.h"	33 #include "ui/gfx/canvas_skia.h"

34 #include "ui/gfx/favicon_size.h"	34 #include "ui/gfx/favicon_size.h"

35 #include "ui/gfx/font.h"	35 #include "ui/gfx/font.h"

36 #include "views/accelerator.h"	36 #include "views/accelerator.h"

37 #include "views/controls/menu/menu_config.h"	37 #include "views/controls/menu/menu_config.h"

(...skipping 608 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
646	646

647 ChromeURLDataManager::DataSource* MenuUI::CreateDataSource() {	647 ChromeURLDataManager::DataSource* MenuUI::CreateDataSource() {

648 return CreateMenuUIHTMLSource(NULL,	648 return CreateMenuUIHTMLSource(NULL,

649 chrome::kChromeUIMenu,	649 chrome::kChromeUIMenu,

650 "Menu" /* class name */,	650 "Menu" /* class name */,

651 kNoExtraResource,	651 kNoExtraResource,

652 kNoExtraResource);	652 kNoExtraResource);

653 }	653 }

654	654

655 } // namespace chromeos	655 } // namespace chromeos

OLD	NEW