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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 8511059: [cros, Aura] Fix login screen crash on boot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/location_bar/location_bar_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 model_(model), 121 model_(model),
122 delegate_(delegate), 122 delegate_(delegate),
123 disposition_(CURRENT_TAB), 123 disposition_(CURRENT_TAB),
124 transition_(content::PageTransitionFromInt( 124 transition_(content::PageTransitionFromInt(
125 content::PAGE_TRANSITION_TYPED | 125 content::PAGE_TRANSITION_TYPED |
126 content::PAGE_TRANSITION_FROM_ADDRESS_BAR)), 126 content::PAGE_TRANSITION_FROM_ADDRESS_BAR)),
127 location_icon_view_(NULL), 127 location_icon_view_(NULL),
128 ev_bubble_view_(NULL), 128 ev_bubble_view_(NULL),
129 location_entry_view_(NULL), 129 location_entry_view_(NULL),
130 selected_keyword_view_(NULL), 130 selected_keyword_view_(NULL),
131 #if defined(OS_WIN) 131 #if defined(OS_WIN) || defined(USE_AURA)
132 suggested_text_view_(NULL), 132 suggested_text_view_(NULL),
133 #endif 133 #endif
134 keyword_hint_view_(NULL), 134 keyword_hint_view_(NULL),
135 star_view_(NULL), 135 star_view_(NULL),
136 mode_(mode), 136 mode_(mode),
137 show_focus_rect_(false), 137 show_focus_rect_(false),
138 bubble_type_(FirstRun::MINIMAL_BUBBLE), 138 bubble_type_(FirstRun::MINIMAL_BUBBLE),
139 template_url_service_(NULL), 139 template_url_service_(NULL),
140 animation_offset_(0) { 140 animation_offset_(0) {
141 set_id(VIEW_ID_LOCATION_BAR); 141 set_id(VIEW_ID_LOCATION_BAR);
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1247 !suggested_text_view_->GetText().empty(); 1247 !suggested_text_view_->GetText().empty();
1248 } 1248 }
1249 1249
1250 #if !defined(USE_AURA) 1250 #if !defined(USE_AURA)
1251 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() { 1251 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
1252 CHECK(!views::Widget::IsPureViews()); 1252 CHECK(!views::Widget::IsPureViews());
1253 return static_cast<OmniboxViewWin*>(location_entry_.get()); 1253 return static_cast<OmniboxViewWin*>(location_entry_.get());
1254 } 1254 }
1255 #endif 1255 #endif
1256 #endif 1256 #endif
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698