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

Side by Side Diff: chrome/browser/views/cookie_prompt_view.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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
« no previous file with comments | « chrome/browser/views/bug_report_view.cc ('k') | chrome/browser/views/database_info_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/views/cookie_prompt_view.h" 5 #include "chrome/browser/views/cookie_prompt_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/gfx/canvas.h" 9 #include "app/gfx/canvas.h"
10 #include "app/gfx/color_utils.h" 10 #include "app/gfx/color_utils.h"
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "base/i18n/time_formatting.h" 12 #include "base/i18n/time_formatting.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/string_util.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/cookie_modal_dialog.h" 16 #include "chrome/browser/cookie_modal_dialog.h"
17 #include "chrome/browser/pref_service.h" 17 #include "chrome/browser/pref_service.h"
18 #include "chrome/browser/profile.h" 18 #include "chrome/browser/profile.h"
19 #include "chrome/browser/views/browser_dialogs.h" 19 #include "chrome/browser/views/browser_dialogs.h"
20 #include "chrome/browser/views/cookie_info_view.h" 20 #include "chrome/browser/views/cookie_info_view.h"
21 #include "chrome/browser/views/database_open_info_view.h" 21 #include "chrome/browser/views/database_open_info_view.h"
22 #include "chrome/browser/views/local_storage_set_item_info_view.h" 22 #include "chrome/browser/views/local_storage_set_item_info_view.h"
23 #include "chrome/browser/views/options/content_settings_window_view.h" 23 #include "chrome/browser/views/options/content_settings_window_view.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 } 286 }
287 287
288 void CookiePromptView::InitializeViewResources() { 288 void CookiePromptView::InitializeViewResources() {
289 CookiePromptModalDialog::DialogType type = parent_->dialog_type(); 289 CookiePromptModalDialog::DialogType type = parent_->dialog_type();
290 title_ = l10n_util::GetStringF( 290 title_ = l10n_util::GetStringF(
291 type == CookiePromptModalDialog::DIALOG_TYPE_COOKIE ? 291 type == CookiePromptModalDialog::DIALOG_TYPE_COOKIE ?
292 IDS_COOKIE_ALERT_TITLE : IDS_DATA_ALERT_TITLE, 292 IDS_COOKIE_ALERT_TITLE : IDS_DATA_ALERT_TITLE,
293 UTF8ToWide(parent_->origin().host())); 293 UTF8ToWide(parent_->origin().host()));
294 } 294 }
295 295
OLDNEW
« no previous file with comments | « chrome/browser/views/bug_report_view.cc ('k') | chrome/browser/views/database_info_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698