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

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

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
11 11
12 #include <algorithm> 12 #include <algorithm>
13 #include <string> 13 #include <string>
14 14
15 #include "app/animation.h" 15 #include "app/animation.h"
16 #include "app/l10n_util.h" 16 #include "app/l10n_util.h"
17 #include "base/base_paths.h" 17 #include "base/base_paths.h"
18 #include "base/command_line.h" 18 #include "base/command_line.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/metrics/histogram.h" 20 #include "base/metrics/histogram.h"
21 #include "base/path_service.h" 21 #include "base/path_service.h"
22 #include "base/string_util.h" 22 #include "base/string_util.h"
23 #include "base/thread.h" 23 #include "base/thread.h"
24 #include "base/thread_restrictions.h" 24 #include "base/thread_restrictions.h"
25 #include "base/utf_string_conversions.h" 25 #include "base/utf_string_conversions.h"
26 #include "gfx/point.h" 26 #include "gfx/point.h"
27 #include "chrome/app/chrome_dll_resource.h" 27 #include "chrome/app/chrome_command_ids.h"
28 #include "chrome/browser/autofill/autofill_manager.h" 28 #include "chrome/browser/autofill/autofill_manager.h"
29 #if defined(OS_WIN) 29 #if defined(OS_WIN)
30 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" 30 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
31 #endif // defined(OS_WIN) 31 #endif // defined(OS_WIN)
32 #include "chrome/browser/bookmarks/bookmark_model.h" 32 #include "chrome/browser/bookmarks/bookmark_model.h"
33 #include "chrome/browser/bookmarks/bookmark_utils.h" 33 #include "chrome/browser/bookmarks/bookmark_utils.h"
34 #include "chrome/browser/browser_list.h" 34 #include "chrome/browser/browser_list.h"
35 #include "chrome/browser/browser_navigator.h" 35 #include "chrome/browser/browser_navigator.h"
36 #include "chrome/browser/browser_process.h" 36 #include "chrome/browser/browser_process.h"
37 #include "chrome/browser/browser_shutdown.h" 37 #include "chrome/browser/browser_shutdown.h"
(...skipping 4042 matching lines...) Expand 10 before | Expand all | Expand 10 after
4080 NOTREACHED(); 4080 NOTREACHED();
4081 return false; 4081 return false;
4082 } 4082 }
4083 4083
4084 void Browser::CreateInstantIfNecessary() { 4084 void Browser::CreateInstantIfNecessary() {
4085 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && 4085 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) &&
4086 !profile()->IsOffTheRecord()) { 4086 !profile()->IsOffTheRecord()) {
4087 instant_.reset(new InstantController(profile_, this)); 4087 instant_.reset(new InstantController(profile_, this));
4088 } 4088 }
4089 } 4089 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698