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

Side by Side Diff: chrome/browser/ui/search/search.cc

Issue 11428149: Alternate NTP: Move bookmark bar to bottom (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 8 years 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/search/search.h" 5 #include "chrome/browser/ui/search/search.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/common/chrome_version_info.h" 10 #include "chrome/common/chrome_version_info.h"
11 11
12 namespace {
13
14 static bool s_force_instant_extended_api_enabled_for_testing = false;
15
16 }
17
12 namespace chrome { 18 namespace chrome {
13 namespace search { 19 namespace search {
14 20
15 bool IsInstantExtendedAPIEnabled(const Profile* profile) { 21 bool IsInstantExtendedAPIEnabled(const Profile* profile) {
22 if (s_force_instant_extended_api_enabled_for_testing)
23 return true;
24
16 return VersionInfo::GetChannel() <= VersionInfo::CHANNEL_DEV && 25 return VersionInfo::GetChannel() <= VersionInfo::CHANNEL_DEV &&
17 !profile->IsOffTheRecord() && 26 !profile->IsOffTheRecord() &&
18 CommandLine::ForCurrentProcess()->HasSwitch( 27 CommandLine::ForCurrentProcess()->HasSwitch(
19 switches::kEnableInstantExtendedAPI); 28 switches::kEnableInstantExtendedAPI);
20 } 29 }
21 30
31 void SetForceInstantExtendedAPIEnabledForTesting(bool force) {
32 s_force_instant_extended_api_enabled_for_testing = force;
33 CHECK(!force || IsInstantExtendedAPIEnabled(NULL));
34 }
35
22 } // namespace search 36 } // namespace search
23 } // namespace chrome 37 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698