chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc - Issue 284893003: Move bookmarks/core/... to bookmarks/...

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_bubble_view.h"	5 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"

6	6

7 #include "base/strings/string16.h"	7 #include "base/strings/string16.h"

8 #include "base/strings/string_util.h"	8 #include "base/strings/string_util.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "chrome/app/chrome_command_ids.h"	10 #include "chrome/app/chrome_command_ids.h"

11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"	13 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"

14 #include "chrome/browser/ui/sync/sync_promo_ui.h"	14 #include "chrome/browser/ui/sync/sync_promo_ui.h"

15 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"	15 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"

16 #include "chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.h"	16 #include "chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.h"

17 #include "components/bookmarks/core/browser/bookmark_model.h"	17 #include "components/bookmarks/browser/bookmark_model.h"

18 #include "components/bookmarks/core/browser/bookmark_utils.h"	18 #include "components/bookmarks/browser/bookmark_utils.h"

19 #include "content/public/browser/user_metrics.h"	19 #include "content/public/browser/user_metrics.h"

20 #include "grit/generated_resources.h"	20 #include "grit/generated_resources.h"

21 #include "grit/theme_resources.h"	21 #include "grit/theme_resources.h"

22 #include "ui/accessibility/ax_view_state.h"	22 #include "ui/accessibility/ax_view_state.h"

23 #include "ui/base/l10n/l10n_util.h"	23 #include "ui/base/l10n/l10n_util.h"

24 #include "ui/base/resource/resource_bundle.h"	24 #include "ui/base/resource/resource_bundle.h"

25 #include "ui/events/keycodes/keyboard_codes.h"	25 #include "ui/events/keycodes/keyboard_codes.h"

26 #include "ui/views/bubble/bubble_frame_view.h"	26 #include "ui/views/bubble/bubble_frame_view.h"

27 #include "ui/views/controls/button/label_button.h"	27 #include "ui/views/controls/button/label_button.h"

28 #include "ui/views/controls/combobox/combobox.h"	28 #include "ui/views/controls/combobox/combobox.h"

(...skipping 330 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
359 if (node) {	359 if (node) {

360 const base::string16 new_title = title_tf_->text();	360 const base::string16 new_title = title_tf_->text();

361 if (new_title != node->GetTitle()) {	361 if (new_title != node->GetTitle()) {

362 model->SetTitle(node, new_title);	362 model->SetTitle(node, new_title);

363 content::RecordAction(	363 content::RecordAction(

364 UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));	364 UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));

365 }	365 }

366 parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index());	366 parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index());

367 }	367 }

368 }	368 }

OLD	NEW