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

Side by Side Diff: chrome/browser/extensions/extension_tabs_module.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, 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/extensions/extension_tabs_module.h" 5 #include "chrome/browser/extensions/extension_tabs_module.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "chrome/browser/browser.h" 8 #include "chrome/browser/browser.h"
9 #include "chrome/browser/browser_list.h" 9 #include "chrome/browser/browser_list.h"
10 #include "chrome/browser/extensions/extension_function_dispatcher.h" 10 #include "chrome/browser/extensions/extension_function_dispatcher.h"
11 #include "chrome/browser/extensions/extension_tabs_module_constants.h" 11 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
12 #include "chrome/browser/extensions/extensions_service.h" 12 #include "chrome/browser/extensions/extensions_service.h"
13 #include "chrome/browser/renderer_host/render_view_host_delegate.h" 13 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
14 #include "chrome/browser/tab_contents/navigation_entry.h" 14 #include "chrome/browser/tab_contents/navigation_entry.h"
15 #include "chrome/common/extensions/extension.h" 15 #include "chrome/common/extensions/extension.h"
16 #include "chrome/common/extensions/extension_error_utils.h" 16 #include "chrome/common/extensions/extension_error_utils.h"
17 17
18 // TODO(port): Port these files. 18 // TODO(port): Port these files.
19 #if defined(OS_WIN) || defined(OS_MACOSX) 19 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(TOOLKIT_VIEWS)
20 #include "chrome/browser/window_sizer.h" 20 #include "chrome/browser/window_sizer.h"
21 #else 21 #else
22 #include "chrome/common/temp_scaffolding_stubs.h" 22 #include "chrome/common/temp_scaffolding_stubs.h"
23 #endif 23 #endif
24 24
25 namespace keys = extension_tabs_module_constants; 25 namespace keys = extension_tabs_module_constants;
26 26
27 // Forward declare static helper functions defined below. 27 // Forward declare static helper functions defined below.
28 static DictionaryValue* CreateWindowValue(Browser* browser, bool populate_tabs); 28 static DictionaryValue* CreateWindowValue(Browser* browser, bool populate_tabs);
29 static ListValue* CreateTabList(Browser* browser); 29 static ListValue* CreateTabList(Browser* browser);
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 if (ExtensionTabUtil::GetTabById(tab_id, profile, browser, tab_strip, 669 if (ExtensionTabUtil::GetTabById(tab_id, profile, browser, tab_strip,
670 contents, tab_index)) 670 contents, tab_index))
671 return true; 671 return true;
672 672
673 if (error_message) 673 if (error_message)
674 *error_message = ExtensionErrorUtils::FormatErrorMessage( 674 *error_message = ExtensionErrorUtils::FormatErrorMessage(
675 keys::kTabNotFoundError, IntToString(tab_id)); 675 keys::kTabNotFoundError, IntToString(tab_id));
676 676
677 return false; 677 return false;
678 } 678 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698