| 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 24 matching lines...) Expand all Loading... |
| 35 : profile_(profile), | 35 : profile_(profile), |
| 36 model_(profile->GetBookmarkModel()), | 36 model_(profile->GetBookmarkModel()), |
| 37 node_(node), | 37 node_(node), |
| 38 index_(index), | 38 index_(index), |
| 39 is_new_(type == NEW_BOOKMARK) { | 39 is_new_(type == NEW_BOOKMARK) { |
| 40 DCHECK(is_new_ || node); | 40 DCHECK(is_new_ || node); |
| 41 | 41 |
| 42 model_->AddObserver(this); | 42 model_->AddObserver(this); |
| 43 | 43 |
| 44 string16 title = is_new_ ? | 44 string16 title = is_new_ ? |
| 45 l10n_util::GetStringUTF16(IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW) : | 45 l10n_util::GetStringUTF16(IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW) : |
| 46 l10n_util::GetStringUTF16(IDS_BOOMARK_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_BOOMARK_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_BOOMARK_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 dialog_->Show(); | 54 dialog_->Show(); |
| 55 } | 55 } |
| 56 | 56 |
| 57 bool BookmarkFolderEditorController::IsValid(const string16& text) { | 57 bool BookmarkFolderEditorController::IsValid(const string16& text) { |
| 58 return !text.empty(); | 58 return !text.empty(); |
| 59 } | 59 } |
| 60 | 60 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 71 void BookmarkFolderEditorController::BookmarkModelChanged() { | 71 void BookmarkFolderEditorController::BookmarkModelChanged() { |
| 72 dialog_->Close(); | 72 dialog_->Close(); |
| 73 } | 73 } |
| 74 | 74 |
| 75 void BookmarkFolderEditorController::BookmarkModelBeingDeleted( | 75 void BookmarkFolderEditorController::BookmarkModelBeingDeleted( |
| 76 BookmarkModel* model) { | 76 BookmarkModel* model) { |
| 77 model_->RemoveObserver(this); | 77 model_->RemoveObserver(this); |
| 78 model_ = NULL; | 78 model_ = NULL; |
| 79 BookmarkModelChanged(); | 79 BookmarkModelChanged(); |
| 80 } | 80 } |
| OLD | NEW |