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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the previous fix Created 9 years, 8 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/views/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 522
523 #if defined(OS_WIN) 523 #if defined(OS_WIN)
524 void BrowserView::PrepareToRunSystemMenu(HMENU menu) { 524 void BrowserView::PrepareToRunSystemMenu(HMENU menu) {
525 system_menu_->UpdateStates(); 525 system_menu_->UpdateStates();
526 } 526 }
527 #endif 527 #endif
528 528
529 // static 529 // static
530 void BrowserView::RegisterBrowserViewPrefs(PrefService* prefs) { 530 void BrowserView::RegisterBrowserViewPrefs(PrefService* prefs) {
531 prefs->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout, 531 prefs->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout,
532 kDefaultPluginMessageResponseTimeout); 532 kDefaultPluginMessageResponseTimeout,
533 false /* don't sync pref */);
533 prefs->RegisterIntegerPref(prefs::kHungPluginDetectFrequency, 534 prefs->RegisterIntegerPref(prefs::kHungPluginDetectFrequency,
534 kDefaultHungPluginDetectFrequency); 535 kDefaultHungPluginDetectFrequency,
536 false /* don't sync pref */);
535 } 537 }
536 538
537 bool BrowserView::IsPositionInWindowCaption(const gfx::Point& point) { 539 bool BrowserView::IsPositionInWindowCaption(const gfx::Point& point) {
538 return GetBrowserViewLayout()->IsPositionInWindowCaption(point); 540 return GetBrowserViewLayout()->IsPositionInWindowCaption(point);
539 } 541 }
540 542
541 /////////////////////////////////////////////////////////////////////////////// 543 ///////////////////////////////////////////////////////////////////////////////
542 // BrowserView, BrowserWindow implementation: 544 // BrowserView, BrowserWindow implementation:
543 545
544 void BrowserView::Show() { 546 void BrowserView::Show() {
(...skipping 1905 matching lines...) Expand 10 before | Expand all | Expand 10 after
2450 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 2452 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
2451 2453
2452 return view; 2454 return view;
2453 } 2455 }
2454 #endif 2456 #endif
2455 2457
2456 // static 2458 // static
2457 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2459 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2458 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2460 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2459 } 2461 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698