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

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

Issue 115803: Fox some compilation problems for Linux. This also adds bookmark_bar_view to ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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/browser.h" 5 #include "chrome/browser/browser.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/idle_timer.h" 9 #include "base/idle_timer.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "chrome/browser/debugger/debugger_window.h" 70 #include "chrome/browser/debugger/debugger_window.h"
71 #include "chrome/browser/download/save_package.h" 71 #include "chrome/browser/download/save_package.h"
72 #include "chrome/browser/ssl/ssl_error_info.h" 72 #include "chrome/browser/ssl/ssl_error_info.h"
73 #include "chrome/browser/task_manager.h" 73 #include "chrome/browser/task_manager.h"
74 #include "chrome/browser/user_data_manager.h" 74 #include "chrome/browser/user_data_manager.h"
75 #include "chrome/browser/view_ids.h" 75 #include "chrome/browser/view_ids.h"
76 #include "chrome/browser/views/location_bar_view.h" 76 #include "chrome/browser/views/location_bar_view.h"
77 #include "chrome/common/child_process_host.h" 77 #include "chrome/common/child_process_host.h"
78 #endif // OS_WIN 78 #endif // OS_WIN
79 79
80 #if defined(OS_WIN) || defined(OS_MACOSX) 80 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(TOOLKIT_VIEWS)
81 #include "chrome/browser/window_sizer.h" 81 #include "chrome/browser/window_sizer.h"
82 #endif 82 #endif
83 83
84 #if defined(TOOLKIT_VIEWS) 84 #if defined(TOOLKIT_VIEWS)
85 #include "chrome/browser/dock_info.h" 85 #include "chrome/browser/dock_info.h"
86 #endif 86 #endif
87 87
88 using base::TimeDelta; 88 using base::TimeDelta;
89 89
90 // How long we wait before updating the browser chrome while loading a page. 90 // How long we wait before updating the browser chrome while loading a page.
(...skipping 2552 matching lines...) Expand 10 before | Expand all | Expand 10 after
2643 2643
2644 // We need to register the window position pref. 2644 // We need to register the window position pref.
2645 std::wstring window_pref(prefs::kBrowserWindowPlacement); 2645 std::wstring window_pref(prefs::kBrowserWindowPlacement);
2646 window_pref.append(L"_"); 2646 window_pref.append(L"_");
2647 window_pref.append(app_name); 2647 window_pref.append(app_name);
2648 PrefService* prefs = g_browser_process->local_state(); 2648 PrefService* prefs = g_browser_process->local_state();
2649 DCHECK(prefs); 2649 DCHECK(prefs);
2650 2650
2651 prefs->RegisterDictionaryPref(window_pref.c_str()); 2651 prefs->RegisterDictionaryPref(window_pref.c_str());
2652 } 2652 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698