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

Side by Side Diff: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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/ui/webui/ntp/ntp_resource_cache.h" 5 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 #if defined(OS_WIN) || defined(TOOLKIT_VIEWS) 53 #if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
54 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 54 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
55 #elif defined(OS_MACOSX) 55 #elif defined(OS_MACOSX)
56 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" 56 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
57 #elif defined(OS_POSIX) 57 #elif defined(OS_POSIX)
58 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h" 58 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
59 #endif 59 #endif
60 60
61 using base::Time; 61 using base::Time;
62 using content::BrowserThread;
62 63
63 namespace { 64 namespace {
64 65
65 // The URL for the the Learn More page shown on incognito new tab. 66 // The URL for the the Learn More page shown on incognito new tab.
66 const char kLearnMoreIncognitoUrl[] = 67 const char kLearnMoreIncognitoUrl[] =
67 #if defined(OS_CHROMEOS) 68 #if defined(OS_CHROMEOS)
68 "https://www.google.com/support/chromeos/bin/answer.py?answer=95464"; 69 "https://www.google.com/support/chromeos/bin/answer.py?answer=95464";
69 #else 70 #else
70 "https://www.google.com/support/chrome/bin/answer.py?answer=95464"; 71 "https://www.google.com/support/chrome/bin/answer.py?answer=95464";
71 #endif 72 #endif
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 IDR_NEW_TAB_4_THEME_CSS : IDR_NEW_TAB_THEME_CSS; 590 IDR_NEW_TAB_4_THEME_CSS : IDR_NEW_TAB_THEME_CSS;
590 static const base::StringPiece new_tab_theme_css( 591 static const base::StringPiece new_tab_theme_css(
591 ResourceBundle::GetSharedInstance().GetRawDataResource( 592 ResourceBundle::GetSharedInstance().GetRawDataResource(
592 ntp_css_resource_id)); 593 ntp_css_resource_id));
593 594
594 // Create the string from our template and the replacements. 595 // Create the string from our template and the replacements.
595 std::string css_string; 596 std::string css_string;
596 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL); 597 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
597 new_tab_css_ = base::RefCountedString::TakeString(&css_string); 598 new_tab_css_ = base::RefCountedString::TakeString(&css_string);
598 } 599 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui.cc ('k') | chrome/browser/ui/webui/options/advanced_options_utils_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698