OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/omnibox/omnibox_edit_controller.h" | 5 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" |
6 | 6 |
7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
8 #include "chrome/browser/command_updater.h" | 8 #include "chrome/browser/command_updater.h" |
9 #include "chrome/browser/ui/toolbar/toolbar_model.h" | |
9 | 10 |
10 void OmniboxEditController::OnAutocompleteAccept( | 11 void OmniboxEditController::OnAutocompleteAccept( |
11 const GURL& destination_url, | 12 const GURL& destination_url, |
12 WindowOpenDisposition disposition, | 13 WindowOpenDisposition disposition, |
13 content::PageTransition transition) { | 14 content::PageTransition transition) { |
14 destination_url_ = destination_url; | 15 destination_url_ = destination_url; |
15 disposition_ = disposition; | 16 disposition_ = disposition; |
16 transition_ = transition; | 17 transition_ = transition; |
17 if (command_updater_) | 18 if (command_updater_) |
18 command_updater_->ExecuteCommand(IDC_OPEN_CURRENT_URL); | 19 command_updater_->ExecuteCommand(IDC_OPEN_CURRENT_URL); |
19 } | 20 } |
20 | 21 |
21 OmniboxEditController::OmniboxEditController(CommandUpdater* command_updater) | 22 OmniboxEditController::OmniboxEditController(CommandUpdater* command_updater) |
22 : command_updater_(command_updater), | 23 : command_updater_(command_updater), |
23 disposition_(CURRENT_TAB), | 24 disposition_(CURRENT_TAB), |
24 transition_(content::PageTransitionFromInt( | 25 transition_(content::PageTransitionFromInt( |
25 content::PAGE_TRANSITION_TYPED | | 26 content::PAGE_TRANSITION_TYPED | |
26 content::PAGE_TRANSITION_FROM_ADDRESS_BAR)) { | 27 content::PAGE_TRANSITION_FROM_ADDRESS_BAR)) { |
27 } | 28 } |
28 | 29 |
30 void OmniboxEditController::HideOriginChip() { | |
31 GetToolbarModel()->set_origin_chip_enabled(false); | |
32 OnChanged(); | |
33 } | |
34 | |
35 void OmniboxEditController::ShowOriginChip() { | |
36 if (GetToolbarModel()->url_replacement_enabled()) { | |
Peter Kasting
2014/03/21 21:22:10
I'm not really clear on what this conditional is d
Justin Donnelly
2014/03/24 22:59:37
This handles the two states we end up in after eit
| |
37 GetToolbarModel()->set_origin_chip_enabled(true); | |
38 OnChanged(); | |
39 } else { | |
40 HideURL(); | |
41 } | |
42 } | |
43 | |
29 OmniboxEditController::~OmniboxEditController() { | 44 OmniboxEditController::~OmniboxEditController() { |
30 } | 45 } |
OLD | NEW |