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

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

Issue 6257017: views: Move standard_layout.h into the layout directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 9 years, 11 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/ui/views/bookmark_editor_view.h" 5 #include "chrome/browser/ui/views/bookmark_editor_view.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/bookmarks/bookmark_model.h" 11 #include "chrome/browser/bookmarks/bookmark_model.h"
12 #include "chrome/browser/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/history/history.h" 13 #include "chrome/browser/history/history.h"
14 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/net/url_fixer_upper.h" 16 #include "chrome/browser/net/url_fixer_upper.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 #include "grit/chromium_strings.h" 19 #include "grit/chromium_strings.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "grit/locale_settings.h" 21 #include "grit/locale_settings.h"
22 #include "net/base/net_util.h" 22 #include "net/base/net_util.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "views/background.h" 24 #include "views/background.h"
25 #include "views/focus/focus_manager.h" 25 #include "views/focus/focus_manager.h"
26 #include "views/grid_layout.h"
27 #include "views/controls/button/native_button.h" 26 #include "views/controls/button/native_button.h"
28 #include "views/controls/label.h" 27 #include "views/controls/label.h"
29 #include "views/controls/menu/menu_2.h" 28 #include "views/controls/menu/menu_2.h"
30 #include "views/standard_layout.h" 29 #include "views/grid_layout.h"
30 #include "views/layout/layout_constants.h"
31 #include "views/widget/widget.h" 31 #include "views/widget/widget.h"
32 #include "views/window/window.h" 32 #include "views/window/window.h"
33 33
34 using views::Button; 34 using views::Button;
35 using views::ColumnSet; 35 using views::ColumnSet;
36 using views::GridLayout; 36 using views::GridLayout;
37 using views::Label; 37 using views::Label;
38 using views::NativeButton; 38 using views::NativeButton;
39 using views::Textfield; 39 using views::Textfield;
40 40
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 break; 579 break;
580 } 580 }
581 } 581 }
582 DCHECK(child_bb_node); 582 DCHECK(child_bb_node);
583 bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle()); 583 bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle());
584 } 584 }
585 ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node, 585 ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node,
586 parent_b_node, parent_bb_node); 586 parent_b_node, parent_bb_node);
587 } 587 }
588 } 588 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmark_bubble_view.cc ('k') | chrome/browser/ui/views/clear_browsing_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698