chrome/browser/ui/webui/bookmarks_ui.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

Side by Side Diff: chrome/browser/ui/webui/bookmarks_ui.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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/ui/website_settings/website_settings_ui.cc ('k') | chrome/browser/ui/webui/conflicts_ui.cc » ('j') | no next file with comments »

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

6	6

7 #include "base/memory/ref_counted_memory.h"	7 #include "base/memory/ref_counted_memory.h"

8 #include "base/memory/singleton.h"	8 #include "base/memory/singleton.h"

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

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

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

12 #include "chrome/browser/bookmarks/bookmark_editor.h"	12 #include "chrome/browser/bookmarks/bookmark_editor.h"

13 #include "chrome/browser/bookmarks/bookmark_model.h"	13 #include "chrome/browser/bookmarks/bookmark_model.h"

14 #include "chrome/browser/bookmarks/bookmark_utils.h"	14 #include "chrome/browser/bookmarks/bookmark_utils.h"

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

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

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

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

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

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

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

22 #include "googleurl/src/gurl.h"	22 #include "googleurl/src/gurl.h"

23 #include "grit/theme_resources.h"	23 #include "grit/theme_resources.h"

24 #include "grit/theme_resources_standard.h"

25 #include "ui/base/layout.h"	24 #include "ui/base/layout.h"

26 #include "ui/base/resource/resource_bundle.h"	25 #include "ui/base/resource/resource_bundle.h"

27	26

28 using content::WebContents;	27 using content::WebContents;

29	28

30 ////////////////////////////////////////////////////////////////////////////////	29 ////////////////////////////////////////////////////////////////////////////////

31 //	30 //

32 // BookmarksUIHTMLSource	31 // BookmarksUIHTMLSource

33 //	32 //

34 ////////////////////////////////////////////////////////////////////////////////	33 ////////////////////////////////////////////////////////////////////////////////

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 Profile* profile = Profile::FromWebUI(web_ui);	66 Profile* profile = Profile::FromWebUI(web_ui);

68 ChromeURLDataManager::AddDataSource(profile, html_source);	67 ChromeURLDataManager::AddDataSource(profile, html_source);

69 }	68 }

70	69

71 // static	70 // static

72 base::RefCountedMemory* BookmarksUI::GetFaviconResourceBytes() {	71 base::RefCountedMemory* BookmarksUI::GetFaviconResourceBytes() {

73 return ResourceBundle::GetSharedInstance().	72 return ResourceBundle::GetSharedInstance().

74 LoadDataResourceBytes(IDR_BOOKMARKS_FAVICON,	73 LoadDataResourceBytes(IDR_BOOKMARKS_FAVICON,

75 ui::SCALE_FACTOR_100P);	74 ui::SCALE_FACTOR_100P);

76 }	75 }

OLD	NEW