| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/bookmarks/bookmark_folder_editor_controller.h" | 5 #include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h" |
| 6 | 6 |
| 7 #include "base/string16.h" | 7 #include "base/string16.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_model.h" | 9 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 | 43 |
| 44 string16 title = is_new_ ? | 44 string16 title = is_new_ ? |
| 45 l10n_util::GetStringUTF16(IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW) : | 45 l10n_util::GetStringUTF16(IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW) : |
| 46 l10n_util::GetStringUTF16(IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE); | 46 l10n_util::GetStringUTF16(IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE); |
| 47 string16 label = | 47 string16 label = |
| 48 l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_EDIT_FOLDER_LABEL); | 48 l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_EDIT_FOLDER_LABEL); |
| 49 string16 contents = is_new_ ? | 49 string16 contents = is_new_ ? |
| 50 l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME) : | 50 l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME) : |
| 51 node_->GetTitle(); | 51 node_->GetTitle(); |
| 52 | 52 |
| 53 dialog_ = InputWindowDialog::Create(wnd, title, label, contents, this); | 53 dialog_ = InputWindowDialog::Create(wnd, title, label, contents, this, |
| 54 is_new_); |
| 54 dialog_->Show(); | 55 dialog_->Show(); |
| 55 } | 56 } |
| 56 | 57 |
| 57 bool BookmarkFolderEditorController::IsValid(const string16& text) { | 58 bool BookmarkFolderEditorController::IsValid(const string16& text) { |
| 58 return !text.empty(); | 59 return !text.empty(); |
| 59 } | 60 } |
| 60 | 61 |
| 61 void BookmarkFolderEditorController::InputAccepted(const string16& text) { | 62 void BookmarkFolderEditorController::InputAccepted(const string16& text) { |
| 62 if (is_new_) | 63 if (is_new_) |
| 63 model_->AddFolder(node_, index_, text); | 64 model_->AddFolder(node_, index_, text); |
| 64 else | 65 else |
| 65 model_->SetTitle(node_, text); | 66 model_->SetTitle(node_, text); |
| 66 } | 67 } |
| 67 | 68 |
| 68 void BookmarkFolderEditorController::InputCanceled() { | 69 void BookmarkFolderEditorController::InputCanceled() { |
| 69 } | 70 } |
| 70 | 71 |
| 71 void BookmarkFolderEditorController::BookmarkModelChanged() { | 72 void BookmarkFolderEditorController::BookmarkModelChanged() { |
| 72 dialog_->Close(); | 73 dialog_->Close(); |
| 73 } | 74 } |
| 74 | 75 |
| 75 void BookmarkFolderEditorController::BookmarkModelBeingDeleted( | 76 void BookmarkFolderEditorController::BookmarkModelBeingDeleted( |
| 76 BookmarkModel* model) { | 77 BookmarkModel* model) { |
| 77 model_->RemoveObserver(this); | 78 model_->RemoveObserver(this); |
| 78 model_ = NULL; | 79 model_ = NULL; |
| 79 BookmarkModelChanged(); | 80 BookmarkModelChanged(); |
| 80 } | 81 } |
| OLD | NEW |