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

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

Issue 115133: Add import settings dialog on linux. (Closed)
Patch Set: fix mac build again Created 11 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/browser.cc » ('j') | chrome/browser/gtk/import_dialog_gtk.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_BROWSER_H_ 5 #ifndef CHROME_BROWSER_BROWSER_H_
6 #define CHROME_BROWSER_BROWSER_H_ 6 #define CHROME_BROWSER_BROWSER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 9
10 #include <set> 10 #include <set>
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 365
366 void ToggleBookmarkBar(); 366 void ToggleBookmarkBar();
367 367
368 #if defined(OS_WIN) 368 #if defined(OS_WIN)
369 void OpenBookmarkManager(); 369 void OpenBookmarkManager();
370 #endif 370 #endif
371 void ShowHistoryTab(); 371 void ShowHistoryTab();
372 void ShowDownloadsTab(); 372 void ShowDownloadsTab();
373 #if defined(OS_WIN) 373 #if defined(OS_WIN)
374 void OpenClearBrowsingDataDialog(); 374 void OpenClearBrowsingDataDialog();
375 void OpenImportSettingsDialog();
376 void OpenOptionsDialog(); 375 void OpenOptionsDialog();
377 void OpenKeywordEditor(); 376 void OpenKeywordEditor();
378 void OpenPasswordManager(); 377 void OpenPasswordManager();
379 #endif 378 #endif
379 #if defined(OS_WIN) || defined(OS_LINUX)
380 void OpenImportSettingsDialog();
381 #endif
380 void OpenAboutChromeDialog(); 382 void OpenAboutChromeDialog();
381 void OpenHelpTab(); 383 void OpenHelpTab();
382 384
383 ///////////////////////////////////////////////////////////////////////////// 385 /////////////////////////////////////////////////////////////////////////////
384 386
385 static void RegisterPrefs(PrefService* prefs); 387 static void RegisterPrefs(PrefService* prefs);
386 static void RegisterUserPrefs(PrefService* prefs); 388 static void RegisterUserPrefs(PrefService* prefs);
387 389
388 // Returns the Browser which contains the tab with the given 390 // Returns the Browser which contains the tab with the given
389 // NavigationController, also filling in |index| (if valid) with the tab's 391 // NavigationController, also filling in |index| (if valid) with the tab's
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 // The browser idle task helps cleanup unused memory resources when idle. 759 // The browser idle task helps cleanup unused memory resources when idle.
758 scoped_ptr<BrowserIdleTimer> idle_task_; 760 scoped_ptr<BrowserIdleTimer> idle_task_;
759 761
760 // Keep track of the encoding auto detect pref. 762 // Keep track of the encoding auto detect pref.
761 BooleanPrefMember encoding_auto_detect_; 763 BooleanPrefMember encoding_auto_detect_;
762 764
763 DISALLOW_COPY_AND_ASSIGN(Browser); 765 DISALLOW_COPY_AND_ASSIGN(Browser);
764 }; 766 };
765 767
766 #endif // CHROME_BROWSER_BROWSER_H_ 768 #endif // CHROME_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser.cc » ('j') | chrome/browser/gtk/import_dialog_gtk.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698