OLD | NEW |
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/toolbar/toolbar_model.h" | 5 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 11 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
12 #include "chrome/browser/search/search.h" | 12 #include "chrome/browser/search/search.h" |
13 #include "chrome/browser/search_engines/template_url.h" | 13 #include "chrome/browser/search_engines/template_url.h" |
14 #include "chrome/browser/search_engines/template_url_service.h" | 14 #include "chrome/browser/search_engines/template_url_service.h" |
15 #include "chrome/browser/search_engines/template_url_service_factory.h" | 15 #include "chrome/browser/search_engines/template_url_service_factory.h" |
16 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
18 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 18 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
20 #include "chrome/test/base/browser_with_test_window_test.h" | 20 #include "chrome/test/base/browser_with_test_window_test.h" |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 toolbar_model->GetSearchTermsType()); | 347 toolbar_model->GetSearchTermsType()); |
348 | 348 |
349 CommitPendingLoad(&contents->GetController()); | 349 CommitPendingLoad(&contents->GetController()); |
350 | 350 |
351 // When done loading search term type should not be normal. | 351 // When done loading search term type should not be normal. |
352 contents->GetController().GetVisibleEntry()->GetSSL().security_style = | 352 contents->GetController().GetVisibleEntry()->GetSSL().security_style = |
353 content::SECURITY_STYLE_UNKNOWN; | 353 content::SECURITY_STYLE_UNKNOWN; |
354 EXPECT_EQ(ToolbarModel::URL_LIKE_SEARCH_TERMS, | 354 EXPECT_EQ(ToolbarModel::URL_LIKE_SEARCH_TERMS, |
355 toolbar_model->GetSearchTermsType()); | 355 toolbar_model->GetSearchTermsType()); |
356 } | 356 } |
OLD | NEW |