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

Side by Side Diff: chrome/browser/views/app_launcher.cc

Issue 1056002: Omnibox M5 work, part 1: Security changes... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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
« no previous file with comments | « chrome/browser/toolbar_model.cc ('k') | chrome/browser/views/location_bar_view.h » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/views/app_launcher.h" 5 #include "chrome/browser/views/app_launcher.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 autocomplete_view->Update(NULL); 190 autocomplete_view->Update(NULL);
191 // The Update call above sets the autocomplete text to the current one in 191 // The Update call above sets the autocomplete text to the current one in
192 // the location bar, make sure to clear it. 192 // the location bar, make sure to clear it.
193 autocomplete_view->SetUserText(std::wstring()); 193 autocomplete_view->SetUserText(std::wstring());
194 #elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS) 194 #elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
195 AutocompleteEditViewGtk* autocomplete_view = 195 AutocompleteEditViewGtk* autocomplete_view =
196 new AutocompleteEditViewGtk(this, browser->toolbar_model(), 196 new AutocompleteEditViewGtk(this, browser->toolbar_model(),
197 browser->profile(), 197 browser->profile(),
198 browser->command_updater(), false, this); 198 browser->command_updater(), false, this);
199 autocomplete_view->Init(); 199 autocomplete_view->Init();
200 gtk_widget_show_all(autocomplete_view->widget()); 200 gtk_widget_show_all(autocomplete_view->GetNativeView());
201 gtk_widget_hide(autocomplete_view->widget()); 201 gtk_widget_hide(autocomplete_view->GetNativeView());
202 location_entry_.reset(autocomplete_view); 202 location_entry_.reset(autocomplete_view);
203 #else 203 #else
204 NOTIMPLEMENTED(); 204 NOTIMPLEMENTED();
205 #endif 205 #endif
206 location_entry_view_->set_focus_view(this); 206 location_entry_view_->set_focus_view(this);
207 location_entry_view_->Attach(location_entry_->GetNativeView()); 207 location_entry_view_->Attach(location_entry_->GetNativeView());
208 } 208 }
209 209
210 virtual void Layout() { 210 virtual void Layout() {
211 gfx::Rect bounds = GetLocalBounds(false); 211 gfx::Rect bounds = GetLocalBounds(false);
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 } 516 }
517 case chromeos::StatusAreaView::OPEN_TABS_ON_RIGHT: { 517 case chromeos::StatusAreaView::OPEN_TABS_ON_RIGHT: {
518 browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL); 518 browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
519 break; 519 break;
520 } 520 }
521 } 521 }
522 #else 522 #else
523 browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL); 523 browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
524 #endif 524 #endif
525 } 525 }
OLDNEW
« no previous file with comments | « chrome/browser/toolbar_model.cc ('k') | chrome/browser/views/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698