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

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

Issue 160598: Add files to browser/sync. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 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 | « WATCHLISTS ('k') | chrome/browser/browser_resources.grd » ('j') | 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) 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/animation.h" 7 #include "app/animation.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/idle_timer.h" 10 #include "base/idle_timer.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "chrome/common/chrome_constants.h" 44 #include "chrome/common/chrome_constants.h"
45 #include "chrome/common/chrome_switches.h" 45 #include "chrome/common/chrome_switches.h"
46 #include "chrome/common/extensions/extension.h" 46 #include "chrome/common/extensions/extension.h"
47 #include "chrome/common/notification_service.h" 47 #include "chrome/common/notification_service.h"
48 #include "chrome/common/page_transition_types.h" 48 #include "chrome/common/page_transition_types.h"
49 #include "chrome/common/platform_util.h" 49 #include "chrome/common/platform_util.h"
50 #include "chrome/common/pref_names.h" 50 #include "chrome/common/pref_names.h"
51 #include "chrome/common/pref_service.h" 51 #include "chrome/common/pref_service.h"
52 #include "chrome/common/url_constants.h" 52 #include "chrome/common/url_constants.h"
53 #ifdef CHROME_PERSONALIZATION 53 #ifdef CHROME_PERSONALIZATION
54 #include "chrome/personalization/personalization.h" 54 #include "chrome/browser/sync/personalization.h"
55 #endif 55 #endif
56 #include "grit/chromium_strings.h" 56 #include "grit/chromium_strings.h"
57 #include "grit/generated_resources.h" 57 #include "grit/generated_resources.h"
58 #include "grit/locale_settings.h" 58 #include "grit/locale_settings.h"
59 #include "net/base/cookie_monster.h" 59 #include "net/base/cookie_monster.h"
60 #include "net/base/cookie_policy.h" 60 #include "net/base/cookie_policy.h"
61 #include "net/base/mime_util.h" 61 #include "net/base/mime_util.h"
62 #include "net/base/net_util.h" 62 #include "net/base/net_util.h"
63 #include "net/base/registry_controlled_domain.h" 63 #include "net/base/registry_controlled_domain.h"
64 #include "net/url_request/url_request_context.h" 64 #include "net/url_request/url_request_context.h"
(...skipping 2727 matching lines...) Expand 10 before | Expand all | Expand 10 after
2792 /////////////////////////////////////////////////////////////////////////////// 2792 ///////////////////////////////////////////////////////////////////////////////
2793 // BrowserToolbarModel (private): 2793 // BrowserToolbarModel (private):
2794 2794
2795 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() { 2795 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
2796 // This |current_tab| can be NULL during the initialization of the 2796 // This |current_tab| can be NULL during the initialization of the
2797 // toolbar during window creation (i.e. before any tabs have been added 2797 // toolbar during window creation (i.e. before any tabs have been added
2798 // to the window). 2798 // to the window).
2799 TabContents* current_tab = browser_->GetSelectedTabContents(); 2799 TabContents* current_tab = browser_->GetSelectedTabContents();
2800 return current_tab ? &current_tab->controller() : NULL; 2800 return current_tab ? &current_tab->controller() : NULL;
2801 } 2801 }
OLDNEW
« no previous file with comments | « WATCHLISTS ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698