| 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/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 { | 69 { |
| 70 GURL("chrome-extension://monkey/balls.html"), | 70 GURL("chrome-extension://monkey/balls.html"), |
| 71 ASCIIToUTF16("chrome-extension://monkey/balls.html"), | 71 ASCIIToUTF16("chrome-extension://monkey/balls.html"), |
| 72 ASCIIToUTF16("chrome-extension://monkey/balls.html"), | 72 ASCIIToUTF16("chrome-extension://monkey/balls.html"), |
| 73 base::string16(), | 73 base::string16(), |
| 74 base::string16(), | 74 base::string16(), |
| 75 false, | 75 false, |
| 76 true | 76 true |
| 77 }, | 77 }, |
| 78 { | 78 { |
| 79 GURL("chrome-internal://newtab/"), | |
| 80 base::string16(), | |
| 81 base::string16(), | |
| 82 base::string16(), | |
| 83 base::string16(), | |
| 84 false, | |
| 85 false | |
| 86 }, | |
| 87 { | |
| 88 GURL(content::kAboutBlankURL), | 79 GURL(content::kAboutBlankURL), |
| 89 ASCIIToUTF16(content::kAboutBlankURL), | 80 ASCIIToUTF16(content::kAboutBlankURL), |
| 90 ASCIIToUTF16(content::kAboutBlankURL), | 81 ASCIIToUTF16(content::kAboutBlankURL), |
| 91 base::string16(), | 82 base::string16(), |
| 92 base::string16(), | 83 base::string16(), |
| 93 false, | 84 false, |
| 94 true | 85 true |
| 95 }, | 86 }, |
| 96 { | 87 { |
| 97 GURL("http://searchurl/?q=tractor+supply"), | 88 GURL("http://searchurl/?q=tractor+supply"), |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 | 352 |
| 362 // The same URL, when specified on the command line, should allow search term | 353 // The same URL, when specified on the command line, should allow search term |
| 363 // extraction. | 354 // extraction. |
| 364 UIThreadSearchTermsData::SetGoogleBaseURL(std::string()); | 355 UIThreadSearchTermsData::SetGoogleBaseURL(std::string()); |
| 365 CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL, | 356 CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL, |
| 366 "http://www.foo.com/"); | 357 "http://www.foo.com/"); |
| 367 NavigateAndCheckText( | 358 NavigateAndCheckText( |
| 368 GURL("http://www.foo.com/search?q=tractor+supply&espv=1"), | 359 GURL("http://www.foo.com/search?q=tractor+supply&espv=1"), |
| 369 ASCIIToUTF16("tractor supply"), true, true); | 360 ASCIIToUTF16("tractor supply"), true, true); |
| 370 } | 361 } |
| OLD | NEW |