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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 422673002: Move BookmarkNodeData into bookmarks namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 6 years, 4 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) 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/omnibox/omnibox_view_views.h" 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "ui/views/ime/input_method.h" 56 #include "ui/views/ime/input_method.h"
57 #include "ui/views/layout/fill_layout.h" 57 #include "ui/views/layout/fill_layout.h"
58 #include "ui/views/views_delegate.h" 58 #include "ui/views/views_delegate.h"
59 #include "ui/views/widget/widget.h" 59 #include "ui/views/widget/widget.h"
60 #include "url/gurl.h" 60 #include "url/gurl.h"
61 61
62 #if defined(OS_WIN) 62 #if defined(OS_WIN)
63 #include "chrome/browser/browser_process.h" 63 #include "chrome/browser/browser_process.h"
64 #endif 64 #endif
65 65
66 using bookmarks::BookmarkNodeData;
66 67
67 namespace { 68 namespace {
68 69
69 // OmniboxState --------------------------------------------------------------- 70 // OmniboxState ---------------------------------------------------------------
70 71
71 // Stores omnibox state for each tab. 72 // Stores omnibox state for each tab.
72 struct OmniboxState : public base::SupportsUserData::Data { 73 struct OmniboxState : public base::SupportsUserData::Data {
73 static const char kKey[]; 74 static const char kKey[];
74 75
75 OmniboxState(const OmniboxEditModel::State& model_state, 76 OmniboxState(const OmniboxEditModel::State& model_state,
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 menu_contents->InsertItemWithStringIdAt( 1041 menu_contents->InsertItemWithStringIdAt(
1041 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); 1042 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);
1042 } 1043 }
1043 1044
1044 // Minor note: We use IDC_ for command id here while the underlying textfield 1045 // Minor note: We use IDC_ for command id here while the underlying textfield
1045 // is using IDS_ for all its command ids. This is because views cannot depend 1046 // is using IDS_ for all its command ids. This is because views cannot depend
1046 // on IDC_ for now. 1047 // on IDC_ for now.
1047 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, 1048 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
1048 IDS_EDIT_SEARCH_ENGINES); 1049 IDS_EDIT_SEARCH_ENGINES);
1049 } 1050 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc ('k') | chrome/browser/undo/bookmark_undo_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698