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

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

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 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) 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/history_ui.h" 5 #include "chrome/browser/ui/webui/history_ui.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 27 matching lines...) Expand all
38 #include "content/public/browser/web_contents_delegate.h" 38 #include "content/public/browser/web_contents_delegate.h"
39 #include "content/public/browser/web_ui.h" 39 #include "content/public/browser/web_ui.h"
40 #include "grit/browser_resources.h" 40 #include "grit/browser_resources.h"
41 #include "grit/chromium_strings.h" 41 #include "grit/chromium_strings.h"
42 #include "grit/generated_resources.h" 42 #include "grit/generated_resources.h"
43 #include "grit/locale_settings.h" 43 #include "grit/locale_settings.h"
44 #include "grit/theme_resources.h" 44 #include "grit/theme_resources.h"
45 #include "grit/theme_resources_standard.h" 45 #include "grit/theme_resources_standard.h"
46 #include "net/base/escape.h" 46 #include "net/base/escape.h"
47 #include "ui/base/l10n/l10n_util.h" 47 #include "ui/base/l10n/l10n_util.h"
48 #include "ui/base/layout.h"
48 #include "ui/base/resource/resource_bundle.h" 49 #include "ui/base/resource/resource_bundle.h"
49 50
50 using content::UserMetricsAction; 51 using content::UserMetricsAction;
51 using content::WebContents; 52 using content::WebContents;
52 53
53 // Maximum number of search results to return in a given search. We should 54 // Maximum number of search results to return in a given search. We should
54 // eventually remove this. 55 // eventually remove this.
55 static const int kMaxSearchResults = 100; 56 static const int kMaxSearchResults = 100;
56 static const char kStringsJsFile[] = "strings.js"; 57 static const char kStringsJsFile[] = "strings.js";
57 static const char kHistoryJsFile[] = "history.js"; 58 static const char kHistoryJsFile[] = "history.js";
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 479
479 // static 480 // static
480 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { 481 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) {
481 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + 482 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
482 net::EscapeQueryParamValue(UTF16ToUTF8(text), true)); 483 net::EscapeQueryParamValue(UTF16ToUTF8(text), true));
483 } 484 }
484 485
485 // static 486 // static
486 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { 487 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes() {
487 return ResourceBundle::GetSharedInstance(). 488 return ResourceBundle::GetSharedInstance().
488 LoadDataResourceBytes(IDR_HISTORY_FAVICON); 489 LoadDataResourceBytes(IDR_HISTORY_FAVICON,
490 ui::SCALE_FACTOR_100P);
489 } 491 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698