| OLD | NEW |
| 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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 | 523 |
| 524 #if defined(OS_WIN) | 524 #if defined(OS_WIN) |
| 525 void BrowserView::PrepareToRunSystemMenu(HMENU menu) { | 525 void BrowserView::PrepareToRunSystemMenu(HMENU menu) { |
| 526 system_menu_->UpdateStates(); | 526 system_menu_->UpdateStates(); |
| 527 } | 527 } |
| 528 #endif | 528 #endif |
| 529 | 529 |
| 530 // static | 530 // static |
| 531 void BrowserView::RegisterBrowserViewPrefs(PrefService* prefs) { | 531 void BrowserView::RegisterBrowserViewPrefs(PrefService* prefs) { |
| 532 prefs->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout, | 532 prefs->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout, |
| 533 kDefaultPluginMessageResponseTimeout); | 533 kDefaultPluginMessageResponseTimeout, |
| 534 false /* don't sync pref */); |
| 534 prefs->RegisterIntegerPref(prefs::kHungPluginDetectFrequency, | 535 prefs->RegisterIntegerPref(prefs::kHungPluginDetectFrequency, |
| 535 kDefaultHungPluginDetectFrequency); | 536 kDefaultHungPluginDetectFrequency, |
| 537 false /* don't sync pref */); |
| 536 } | 538 } |
| 537 | 539 |
| 538 bool BrowserView::IsPositionInWindowCaption(const gfx::Point& point) { | 540 bool BrowserView::IsPositionInWindowCaption(const gfx::Point& point) { |
| 539 return GetBrowserViewLayout()->IsPositionInWindowCaption(point); | 541 return GetBrowserViewLayout()->IsPositionInWindowCaption(point); |
| 540 } | 542 } |
| 541 | 543 |
| 542 /////////////////////////////////////////////////////////////////////////////// | 544 /////////////////////////////////////////////////////////////////////////////// |
| 543 // BrowserView, BrowserWindow implementation: | 545 // BrowserView, BrowserWindow implementation: |
| 544 | 546 |
| 545 void BrowserView::Show() { | 547 void BrowserView::Show() { |
| (...skipping 1911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2457 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2459 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2458 | 2460 |
| 2459 return view; | 2461 return view; |
| 2460 } | 2462 } |
| 2461 #endif | 2463 #endif |
| 2462 | 2464 |
| 2463 // static | 2465 // static |
| 2464 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2466 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2465 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2467 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2466 } | 2468 } |
| OLD | NEW |