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

Side by Side Diff: chrome/browser/ui/chrome_select_file_policy.cc

Issue 2711623003: Update infobars to use VectorIcon struct instead of VectorIconId. (Closed)
Patch Set: move extension.icon Created 3 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
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/chrome_select_file_policy.h" 5 #include "chrome/browser/ui/chrome_select_file_policy.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 15 matching lines...) Expand all
26 26
27 bool ChromeSelectFilePolicy::CanOpenSelectFileDialog() { 27 bool ChromeSelectFilePolicy::CanOpenSelectFileDialog() {
28 return FileSelectDialogsAllowed(); 28 return FileSelectDialogsAllowed();
29 } 29 }
30 30
31 void ChromeSelectFilePolicy::SelectFileDenied() { 31 void ChromeSelectFilePolicy::SelectFileDenied() {
32 // Show the InfoBar saying that file-selection dialogs are disabled. 32 // Show the InfoBar saying that file-selection dialogs are disabled.
33 if (source_contents_) { 33 if (source_contents_) {
34 SimpleAlertInfoBarDelegate::Create( 34 SimpleAlertInfoBarDelegate::Create(
35 InfoBarService::FromWebContents(source_contents_), 35 InfoBarService::FromWebContents(source_contents_),
36 infobars::InfoBarDelegate::CHROME_SELECT_FILE_POLICY, 36 infobars::InfoBarDelegate::CHROME_SELECT_FILE_POLICY, nullptr,
Peter Kasting 2017/02/24 02:12:26 Not for this CL (since this isn't a behavior chang
Evan Stade 2017/02/24 17:18:16 they'd probably tell us to reuse the business icon
37 infobars::InfoBarDelegate::kNoIconID,
38 gfx::VectorIconId::VECTOR_ICON_NONE,
39 l10n_util::GetStringUTF16(IDS_FILE_SELECTION_DIALOG_INFOBAR), true); 37 l10n_util::GetStringUTF16(IDS_FILE_SELECTION_DIALOG_INFOBAR), true);
40 } else { 38 } else {
41 LOG(WARNING) << "File-selection dialogs are disabled but no WebContents " 39 LOG(WARNING) << "File-selection dialogs are disabled but no WebContents "
42 << "is given to display the InfoBar."; 40 << "is given to display the InfoBar.";
43 } 41 }
44 } 42 }
45 43
46 // static 44 // static
47 bool ChromeSelectFilePolicy::FileSelectDialogsAllowed() { 45 bool ChromeSelectFilePolicy::FileSelectDialogsAllowed() {
48 DCHECK(g_browser_process); 46 DCHECK(g_browser_process);
49 47
50 // local_state() can return NULL for tests. 48 // local_state() can return NULL for tests.
51 if (!g_browser_process->local_state()) 49 if (!g_browser_process->local_state())
52 return false; 50 return false;
53 51
54 return !g_browser_process->local_state()->FindPreference( 52 return !g_browser_process->local_state()->FindPreference(
55 prefs::kAllowFileSelectionDialogs) || 53 prefs::kAllowFileSelectionDialogs) ||
56 g_browser_process->local_state()->GetBoolean( 54 g_browser_process->local_state()->GetBoolean(
57 prefs::kAllowFileSelectionDialogs); 55 prefs::kAllowFileSelectionDialogs);
58 } 56 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698