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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

Issue 2406363003: Update appearance of invalid textfields in Harmony. (Closed)
Patch Set: combine install with setcolorid Created 4 years, 2 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/views/bookmarks/bookmark_editor_view.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 15 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
16 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" 16 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h"
17 #include "chrome/browser/ui/browser_dialogs.h" 17 #include "chrome/browser/ui/browser_dialogs.h"
18 #include "chrome/grit/generated_resources.h" 18 #include "chrome/grit/generated_resources.h"
19 #include "chrome/grit/locale_settings.h" 19 #include "chrome/grit/locale_settings.h"
20 #include "components/bookmarks/browser/bookmark_model.h" 20 #include "components/bookmarks/browser/bookmark_model.h"
21 #include "components/bookmarks/browser/bookmark_utils.h" 21 #include "components/bookmarks/browser/bookmark_utils.h"
22 #include "components/constrained_window/constrained_window_views.h" 22 #include "components/constrained_window/constrained_window_views.h"
23 #include "components/history/core/browser/history_service.h" 23 #include "components/history/core/browser/history_service.h"
24 #include "components/strings/grit/components_strings.h" 24 #include "components/strings/grit/components_strings.h"
25 #include "components/url_formatter/url_fixer.h" 25 #include "components/url_formatter/url_fixer.h"
26 #include "components/user_prefs/user_prefs.h" 26 #include "components/user_prefs/user_prefs.h"
27 #include "ui/accessibility/ax_view_state.h" 27 #include "ui/accessibility/ax_view_state.h"
28 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/base/material_design/material_design_controller.h"
29 #include "ui/events/event.h" 30 #include "ui/events/event.h"
30 #include "ui/views/background.h" 31 #include "ui/views/background.h"
31 #include "ui/views/controls/button/md_text_button.h" 32 #include "ui/views/controls/button/md_text_button.h"
32 #include "ui/views/controls/label.h" 33 #include "ui/views/controls/label.h"
33 #include "ui/views/controls/menu/menu_runner.h" 34 #include "ui/views/controls/menu/menu_runner.h"
34 #include "ui/views/controls/textfield/textfield.h" 35 #include "ui/views/controls/textfield/textfield.h"
35 #include "ui/views/controls/tree/tree_view.h" 36 #include "ui/views/controls/tree/tree_view.h"
36 #include "ui/views/focus/focus_manager.h" 37 #include "ui/views/focus/focus_manager.h"
37 #include "ui/views/layout/grid_layout.h" 38 #include "ui/views/layout/grid_layout.h"
38 #include "ui/views/layout/layout_constants.h" 39 #include "ui/views/layout/layout_constants.h"
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 GURL BookmarkEditorView::GetInputURL() const { 430 GURL BookmarkEditorView::GetInputURL() const {
430 if (details_.GetNodeType() == BookmarkNode::FOLDER) 431 if (details_.GetNodeType() == BookmarkNode::FOLDER)
431 return GURL(); 432 return GURL();
432 return url_formatter::FixupURL(base::UTF16ToUTF8(url_tf_->text()), 433 return url_formatter::FixupURL(base::UTF16ToUTF8(url_tf_->text()),
433 std::string()); 434 std::string());
434 } 435 }
435 436
436 void BookmarkEditorView::UserInputChanged() { 437 void BookmarkEditorView::UserInputChanged() {
437 if (details_.GetNodeType() != BookmarkNode::FOLDER) { 438 if (details_.GetNodeType() != BookmarkNode::FOLDER) {
438 const GURL url(GetInputURL()); 439 const GURL url(GetInputURL());
439 if (!url.is_valid()) 440 if (ui::MaterialDesignController::IsSecondaryUiMaterial())
441 url_tf_->SetInvalid(!url.is_valid());
442 else if (!url.is_valid())
440 url_tf_->SetBackgroundColor(kErrorColor); 443 url_tf_->SetBackgroundColor(kErrorColor);
441 else 444 else
442 url_tf_->UseDefaultBackgroundColor(); 445 url_tf_->UseDefaultBackgroundColor();
443 } 446 }
444 GetDialogClientView()->UpdateDialogButtons(); 447 GetDialogClientView()->UpdateDialogButtons();
445 } 448 }
446 449
447 void BookmarkEditorView::NewFolder() { 450 void BookmarkEditorView::NewFolder() {
448 // Create a new entry parented to the selected item, or the bookmark 451 // Create a new entry parented to the selected item, or the bookmark
449 // bar if nothing is selected. 452 // bar if nothing is selected.
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 Profile* profile, 656 Profile* profile,
654 const BookmarkEditor::EditDetails& details, 657 const BookmarkEditor::EditDetails& details,
655 BookmarkEditor::Configuration configuration) { 658 BookmarkEditor::Configuration configuration) {
656 DCHECK(profile); 659 DCHECK(profile);
657 BookmarkEditorView* editor = new BookmarkEditorView( 660 BookmarkEditorView* editor = new BookmarkEditorView(
658 profile, details.parent_node, details, configuration); 661 profile, details.parent_node, details, configuration);
659 editor->Show(parent_window); 662 editor->Show(parent_window);
660 } 663 }
661 664
662 } // namespace chrome 665 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/autofill/decorated_textfield.cc ('k') | ui/views/controls/combobox/combobox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698