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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 10982092: Forcing disabling of spelling temporarily until flag is fixed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing compile error Created 8 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 // The user stylesheet watcher may not exist in a testing profile. 1533 // The user stylesheet watcher may not exist in a testing profile.
1534 UserStyleSheetWatcher* user_style_sheet_watcher = 1534 UserStyleSheetWatcher* user_style_sheet_watcher =
1535 UserStyleSheetWatcherFactory::GetForProfile(profile); 1535 UserStyleSheetWatcherFactory::GetForProfile(profile);
1536 if (user_style_sheet_watcher) { 1536 if (user_style_sheet_watcher) {
1537 web_prefs->user_style_sheet_enabled = true; 1537 web_prefs->user_style_sheet_enabled = true;
1538 web_prefs->user_style_sheet_location = 1538 web_prefs->user_style_sheet_location =
1539 user_style_sheet_watcher->user_style_sheet(); 1539 user_style_sheet_watcher->user_style_sheet();
1540 } else { 1540 } else {
1541 web_prefs->user_style_sheet_enabled = false; 1541 web_prefs->user_style_sheet_enabled = false;
1542 } 1542 }
1543 1543
1544 // TODO(rlp): crbug.com/144863 Forcing flag to off temporarily until flag
1545 // is fixed.
1546 CommandLine::ForCurrentProcess()->
1547 AppendSwitch(switches::kDisableAsynchronousSpellChecking);
1544 web_prefs->asynchronous_spell_checking_enabled = 1548 web_prefs->asynchronous_spell_checking_enabled =
1545 #if defined(OS_MACOSX) 1549 #if defined(OS_MACOSX)
1546 // TODO(hbono): Bug 107371: Implement asynchronous spellchecking API for 1550 // TODO(hbono): Bug 107371: Implement asynchronous spellchecking API for
1547 // Mac so it uses NSSpellChecker in the background. 1551 // Mac so it uses NSSpellChecker in the background.
1548 false; 1552 false;
1549 #else 1553 #else
1550 !CommandLine::ForCurrentProcess()-> 1554 !CommandLine::ForCurrentProcess()->
1551 HasSwitch(switches::kDisableAsynchronousSpellChecking); 1555 HasSwitch(switches::kDisableAsynchronousSpellChecking);
1552 #endif 1556 #endif
1553 web_prefs->unified_textchecker_enabled = 1557 web_prefs->unified_textchecker_enabled =
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1794 partition_id = extension->id(); 1798 partition_id = extension->id();
1795 } 1799 }
1796 1800
1797 // Enforce that IsValidStoragePartitionId() implementation stays in sync. 1801 // Enforce that IsValidStoragePartitionId() implementation stays in sync.
1798 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); 1802 DCHECK(IsValidStoragePartitionId(browser_context, partition_id));
1799 return partition_id; 1803 return partition_id;
1800 } 1804 }
1801 1805
1802 1806
1803 } // namespace chrome 1807 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698