Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: chrome/browser/dom_ui/ntp_resource_cache.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
OLDNEW
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/dom_ui/ntp_resource_cache.h" 5 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/themes/browser_theme_provider.h" 24 #include "chrome/browser/themes/browser_theme_provider.h"
25 #include "chrome/browser/web_resource/web_resource_service.h" 25 #include "chrome/browser/web_resource/web_resource_service.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/extensions/extension.h" 27 #include "chrome/common/extensions/extension.h"
28 #include "chrome/common/extensions/extension_constants.h" 28 #include "chrome/common/extensions/extension_constants.h"
29 #include "chrome/common/jstemplate_builder.h" 29 #include "chrome/common/jstemplate_builder.h"
30 #include "chrome/common/notification_service.h" 30 #include "chrome/common/notification_service.h"
31 #include "chrome/common/notification_type.h" 31 #include "chrome/common/notification_type.h"
32 #include "chrome/common/pref_names.h" 32 #include "chrome/common/pref_names.h"
33 #include "chrome/common/url_constants.h" 33 #include "chrome/common/url_constants.h"
34 #include "gfx/color_utils.h"
35 #include "grit/browser_resources.h" 34 #include "grit/browser_resources.h"
36 #include "grit/chromium_strings.h" 35 #include "grit/chromium_strings.h"
37 #include "grit/generated_resources.h" 36 #include "grit/generated_resources.h"
38 #include "grit/locale_settings.h" 37 #include "grit/locale_settings.h"
39 #include "grit/theme_resources.h" 38 #include "grit/theme_resources.h"
40 #include "ui/base/animation/animation.h" 39 #include "ui/base/animation/animation.h"
41 #include "ui/base/l10n/l10n_util.h" 40 #include "ui/base/l10n/l10n_util.h"
42 #include "ui/base/resource/resource_bundle.h" 41 #include "ui/base/resource/resource_bundle.h"
43 #include "ui/base/theme_provider.h" 42 #include "ui/base/theme_provider.h"
43 #include "ui/gfx/color_utils.h"
44 44
45 #if defined(OS_WIN) || defined(TOOLKIT_VIEWS) 45 #if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
46 #include "chrome/browser/ui/views/bookmark_bar_view.h" 46 #include "chrome/browser/ui/views/bookmark_bar_view.h"
47 #elif defined(OS_MACOSX) 47 #elif defined(OS_MACOSX)
48 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" 48 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
49 #elif defined(OS_POSIX) 49 #elif defined(OS_POSIX)
50 #include "chrome/browser/ui/gtk/bookmark_bar_gtk.h" 50 #include "chrome/browser/ui/gtk/bookmark_bar_gtk.h"
51 #endif 51 #endif
52 52
53 using base::Time; 53 using base::Time;
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 std::string css_string; 550 std::string css_string;
551 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL); 551 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
552 css_string = ReplaceStringPlaceholders(css_string, subst2, NULL); 552 css_string = ReplaceStringPlaceholders(css_string, subst2, NULL);
553 css_string = ReplaceStringPlaceholders(css_string, subst3, NULL); 553 css_string = ReplaceStringPlaceholders(css_string, subst3, NULL);
554 554
555 new_tab_css_ = new RefCountedBytes; 555 new_tab_css_ = new RefCountedBytes;
556 new_tab_css_->data.resize(css_string.size()); 556 new_tab_css_->data.resize(css_string.size());
557 std::copy(css_string.begin(), css_string.end(), 557 std::copy(css_string.begin(), css_string.end(),
558 new_tab_css_->data.begin()); 558 new_tab_css_->data.begin());
559 } 559 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698