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

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

Issue 530963002: Move IDS_LEARN_MORE to components_strings.grd (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build Created 6 years, 3 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
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/conflicts_ui.h" 5 #include "chrome/browser/ui/webui/conflicts_ui.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 11 matching lines...) Expand all
22 #include "chrome/grit/generated_resources.h" 22 #include "chrome/grit/generated_resources.h"
23 #include "content/public/browser/notification_observer.h" 23 #include "content/public/browser/notification_observer.h"
24 #include "content/public/browser/notification_registrar.h" 24 #include "content/public/browser/notification_registrar.h"
25 #include "content/public/browser/notification_service.h" 25 #include "content/public/browser/notification_service.h"
26 #include "content/public/browser/user_metrics.h" 26 #include "content/public/browser/user_metrics.h"
27 #include "content/public/browser/web_contents.h" 27 #include "content/public/browser/web_contents.h"
28 #include "content/public/browser/web_ui.h" 28 #include "content/public/browser/web_ui.h"
29 #include "content/public/browser/web_ui_data_source.h" 29 #include "content/public/browser/web_ui_data_source.h"
30 #include "content/public/browser/web_ui_message_handler.h" 30 #include "content/public/browser/web_ui_message_handler.h"
31 #include "grit/browser_resources.h" 31 #include "grit/browser_resources.h"
32 #include "grit/components_strings.h"
32 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
33 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/layout.h" 35 #include "ui/base/layout.h"
35 #include "ui/base/resource/resource_bundle.h" 36 #include "ui/base/resource/resource_bundle.h"
36 37
37 using base::UserMetricsAction; 38 using base::UserMetricsAction;
38 using content::WebContents; 39 using content::WebContents;
39 using content::WebUIMessageHandler; 40 using content::WebUIMessageHandler;
40 41
41 namespace { 42 namespace {
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 173
173 // static 174 // static
174 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes( 175 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes(
175 ui::ScaleFactor scale_factor) { 176 ui::ScaleFactor scale_factor) {
176 return static_cast<base::RefCountedMemory*>( 177 return static_cast<base::RefCountedMemory*>(
177 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 178 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
178 IDR_CONFLICT_FAVICON, scale_factor)); 179 IDR_CONFLICT_FAVICON, scale_factor));
179 } 180 }
180 181
181 #endif 182 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698