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

Side by Side Diff: chrome/browser/bookmarks/bookmark_folder_editor_controller.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflict resolved Created 9 years, 3 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 | Annotate | Revision Log
OLDNEW
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
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 #if !defined(USE_AURA)
54 // TODO(saintlou): We seem to be missing a pure Views implemntation.
53 dialog_ = InputWindowDialog::Create(wnd, title, label, contents, this); 55 dialog_ = InputWindowDialog::Create(wnd, title, label, contents, this);
54 dialog_->Show(); 56 dialog_->Show();
57 #endif
55 } 58 }
56 59
57 bool BookmarkFolderEditorController::IsValid(const string16& text) { 60 bool BookmarkFolderEditorController::IsValid(const string16& text) {
58 return !text.empty(); 61 return !text.empty();
59 } 62 }
60 63
61 void BookmarkFolderEditorController::InputAccepted(const string16& text) { 64 void BookmarkFolderEditorController::InputAccepted(const string16& text) {
62 if (is_new_) 65 if (is_new_)
63 model_->AddFolder(node_, index_, text); 66 model_->AddFolder(node_, index_, text);
64 else 67 else
65 model_->SetTitle(node_, text); 68 model_->SetTitle(node_, text);
66 } 69 }
67 70
68 void BookmarkFolderEditorController::InputCanceled() { 71 void BookmarkFolderEditorController::InputCanceled() {
69 } 72 }
70 73
71 void BookmarkFolderEditorController::BookmarkModelChanged() { 74 void BookmarkFolderEditorController::BookmarkModelChanged() {
72 dialog_->Close(); 75 dialog_->Close();
73 } 76 }
74 77
75 void BookmarkFolderEditorController::BookmarkModelBeingDeleted( 78 void BookmarkFolderEditorController::BookmarkModelBeingDeleted(
76 BookmarkModel* model) { 79 BookmarkModel* model) {
77 model_->RemoveObserver(this); 80 model_->RemoveObserver(this);
78 model_ = NULL; 81 model_ = NULL;
79 BookmarkModelChanged(); 82 BookmarkModelChanged();
80 } 83 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698