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

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

Issue 9479008: Re-factor location bar/toolbar code to get rid of the browser dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 8 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
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_win.h" 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <locale> 8 #include <locale>
9 #include <string> 9 #include <string>
10 10
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 429
430 } // namespace 430 } // namespace
431 431
432 OmniboxViewWin::OmniboxViewWin(AutocompleteEditController* controller, 432 OmniboxViewWin::OmniboxViewWin(AutocompleteEditController* controller,
433 ToolbarModel* toolbar_model, 433 ToolbarModel* toolbar_model,
434 LocationBarView* parent_view, 434 LocationBarView* parent_view,
435 CommandUpdater* command_updater, 435 CommandUpdater* command_updater,
436 bool popup_window_mode, 436 bool popup_window_mode,
437 views::View* location_bar) 437 views::View* location_bar)
438 : model_(new AutocompleteEditModel(this, controller, 438 : model_(new AutocompleteEditModel(this, controller,
439 parent_view->browser()->profile())), 439 parent_view->profile())),
440 popup_view_(new AutocompletePopupContentsView(parent_view->font(), this, 440 popup_view_(new AutocompletePopupContentsView(parent_view->font(), this,
441 model_.get(), 441 model_.get(),
442 location_bar)), 442 location_bar)),
443 controller_(controller), 443 controller_(controller),
444 parent_view_(parent_view), 444 parent_view_(parent_view),
445 toolbar_model_(toolbar_model), 445 toolbar_model_(toolbar_model),
446 command_updater_(command_updater), 446 command_updater_(command_updater),
447 popup_window_mode_(popup_window_mode), 447 popup_window_mode_(popup_window_mode),
448 force_hidden_(false), 448 force_hidden_(false),
449 tracking_click_(), 449 tracking_click_(),
(...skipping 2275 matching lines...) Expand 10 before | Expand all | Expand 10 after
2725 return omnibox_view; 2725 return omnibox_view;
2726 } 2726 }
2727 return new OmniboxViewWin(controller, 2727 return new OmniboxViewWin(controller,
2728 toolbar_model, 2728 toolbar_model,
2729 location_bar, 2729 location_bar,
2730 command_updater, 2730 command_updater,
2731 popup_window_mode, 2731 popup_window_mode,
2732 location_bar); 2732 location_bar);
2733 } 2733 }
2734 #endif 2734 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698